Mercurial > gemma

changeset 3723:9759355d7b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import: Fixed data initialization for database rows.
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 20 Jun 2019 18:15:57 +0200
parents f180de37903c
children 05bbd1a97567
files pkg/imports/gm.go
diffstat 1 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/gm.go	Thu Jun 20 18:10:08 2019 +0200
+++ b/pkg/imports/gm.go	Thu Jun 20 18:15:57 2019 +0200
@@ -386,6 +386,11 @@
 			newM, newP := 0, 0
 			for _, measure := range wrm.Measure {
 				var unit string
+				if *measure.Measure_code != nts.Measure_code_enumWAL {
+					feedback.Warn("Ignored message with measure_code %s",
+						*measure.Measure_code)
+					continue
+				}
 				if measure.Unit == nil {
 					feedback.Info("'Unit' not specified. Assuming 'cm'")
 					unit = "cm"
@@ -400,17 +405,18 @@
 				convert(measure.Value_min)
 				convert(measure.Value_max)
 
-				if *measure.Measure_code != nts.Measure_code_enumWAL {
-					feedback.Warn("Ignored message with measure_code %s",
-						*measure.Measure_code)
-					continue
-				}
-
 				var dummy int
 				if measure.Predicted {
-					var confInterval pgtype.Numrange
+					confInterval := pgtype.Numrange{
+						Lower:     pgtype.Numeric{Status: pgtype.Null},
+						Upper:     pgtype.Numeric{Status: pgtype.Null},
+						LowerType: pgtype.Inclusive,
+						UpperType: pgtype.Inclusive,
+						Status:    pgtype.Null,
+					}
 					if measure.Value_min != nil && measure.Value_max != nil {
-						var valueMin, valueMax pgtype.Numeric
+						valueMin := pgtype.Numeric{Status: pgtype.Null}
+						valueMax := pgtype.Numeric{Status: pgtype.Null}
 						valueMin.Set(measure.Value_min)
 						valueMax.Set(measure.Value_max)
 						confInterval = pgtype.Numrange{