gemma: pkg/imports/gm.go comparison

comparison pkg/imports/gm.go @ 5529:f95f268a83bd aggregate-gm-import-logging

WIP: Continued work on aggregating GM logs.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Sun, 24 Oct 2021 20:16:41 +0200
parents	133dc5b3076a
children	3ccbb6162112

comparison

equal deleted inserted replaced

-:133dc5b3076a
+:f95f268a83bd
 	}
 	return fn, nil
 }
 type gmLog struct {
-	isrs                *models.Isrs
+	gid                 string
 	unknown             bool
 	assumedZPG          bool
-	ignoredMeasureCodes []nts.Measure_code_enum
+	ignoredMeasureCodes []string
+	rescaleErrors       []string
 	assumedCM           int
 	missingValues       []time.Time
 	badValue            int
 	newM                int
 	newP                int
 }
 type gmLogs []*gmLog
+func extend(haystack []string, needle string) []string {
+	for _, straw := range haystack {
+		if straw == needle {
+			return haystack
+		}
+	}
+	return append(haystack, needle)
+}
+func (gl *gmLog) addRescaleError(err error) {
+	gl.rescaleErrors = extend(gl.rescaleErrors, err.Error())
+}
 func (gl *gmLog) ignoreMeasureCode(mc nts.Measure_code_enum) {
-	for _, m := range gl.ignoredMeasureCodes {
+	gl.ignoredMeasureCodes = extend(gl.ignoredMeasureCodes, string(mc))
-		if m == mc {
+}
-			return
-		}
+func (gls gmLogs) find(gid string) *gmLog {
-	}
+	for _, gl := range gls {
-	gl.ignoredMeasureCodes = append(gl.ignoredMeasureCodes, mc)
+		if gl.gid == gid {
+			return gl
+		}
+	}
+	return nil
 }
 func (gls gmLogs) logging(feedback Feedback) {
 	gls.logUnknown(feedback)
 	gls.logAssumedZPG(feedback)
-	// TODO: assumed CM
+	gls.logAssumedCM(feedback)
 	// TODO: bad values
 	// TODO: missing values
+	// TODO: rescale errors
 	// TODO: new predictions
 	// TODO: new measurements
+}
+func (gls gmLogs) logAssumedCM(feedback Feedback) {
+	var sb strings.Builder
+	for _, gl := range gls {
+		if gl.assumedCM > 0 {
+			if sb.Len() == 0 {
+				sb.WriteString("'Unit' not specified. Assuming 'cm': ")
+			} else {
+				sb.WriteString(", ")
+			}
+			fmt.Fprintf(&sb, "%s (%d)", gl.gid, gl.assumedCM)
+		}
+	}
+	if sb.Len() > 0 {
+		feedback.Warn(sb.String())
+	}
 }
 func (gls gmLogs) logUnknown(feedback Feedback) {
 	var sb strings.Builder
 	for _, gl := range gls {
 			if sb.Len() == 0 {
 				sb.WriteString("Cannot find following gauges: ")
 			} else {
 				sb.WriteString(", ")
 			}
-			sb.WriteString(gl.isrs.String())
+			sb.WriteString(gl.gid)
 		}
 	}
 	if sb.Len() > 0 {
 		feedback.Warn(sb.String())
 	}
 			if sb.Len() == 0 {
 				sb.WriteString("'Reference_code' not specified. Assuming 'ZPG': ")
 			} else {
 				sb.WriteString(", ")
 			}
-			sb.WriteString(gl.isrs.String())
+			sb.WriteString(gl.gid)
 		}
 	}
 	if sb.Len() > 0 {
 		feedback.Info(sb.String())
+	}
+}
+// logFinder is a helper to search recently used logs
+// or create a new one if no log for a given gauge
+// existed before.
+func logFinder(logs *gmLogs) func(string) *gmLog {
+	var lastLog *gmLog
+	return func(gid string) *gmLog {
+		if lastLog != nil && lastLog.gid == gid {
+			return lastLog
+		}
+		if ll := logs.find(gid); ll != nil {
+			lastLog = ll
+			return ll
+		}
+		lastLog = &gmLog{gid: gid}
+		*logs = append(*logs, lastLog)
+		return lastLog
 	}
 }
 func doForGM(
 	ctx context.Context,
 	// To prevent spamming the log actual logging
 	// is defered to be presented in an aggregated way.
 	var logs gmLogs
 	defer logs.logging(feedback)
+	findLog := logFinder(&logs)
 	for _, msg := range result {
 		for _, wrm := range msg.Wrm {
 			curr := string(*wrm.Geo_object.Id)
 			curr = strings.TrimSpace(curr)
 			currIsrs, err := models.IsrsFromString(curr)
 			if err != nil {
 				feedback.Warn("Invalid ISRS code %v", err)
 				continue
 			}
-			log := &gmLog{isrs: currIsrs}
+			log := findLog(curr)
-			logs = append(logs, log)
 			gids = append(gids, curr)
 			//feedback.Info("Found measurements/predictions for %s", curr)
 			if !isKnown(curr) {
 				log.unknown = true
 					continue
 				}
 				convert, err := rescale(unit)
 				if err != nil {
-					// TODO: log rescale error
+					log.addRescaleError(err)
-					feedback.Error(err.Error())
 					continue
 				}
 				convert(measure.Value)
 				convert(measure.Value_min)
 				convert(measure.Value_max)

Mercurial > gemma

comparison pkg/imports/gm.go @ 5529:f95f268a83bd aggregate-gm-import-logging