diff pkg/imports/gm.go @ 3278:831193935739

Avoid storing of NtS messages other than water level
author Tom Gottfried <tom@intevation.de>
date Wed, 15 May 2019 19:42:21 +0200
parents 232fc90e6ee2
children 7ae1892773a2
line wrap: on
line diff
--- a/pkg/imports/gm.go	Wed May 15 19:08:49 2019 +0200
+++ b/pkg/imports/gm.go	Wed May 15 19:42:21 2019 +0200
@@ -54,7 +54,6 @@
   date_issue,
   reference_code,
   water_level,
-  is_waterlevel,
   date_info,
   source_organization,
   staging_done
@@ -69,7 +68,6 @@
   $12,
   $13,
   $14,
-  $15,
   true
 )
 ON CONFLICT DO NOTHING
@@ -86,7 +84,6 @@
   date_issue,
   reference_code,
   water_level,
-  is_waterlevel,
   conf_interval,
   date_info,
   source_organization
@@ -101,8 +98,7 @@
   $12,
   $13,
   $14,
-  $15,
-  $16
+  $15
 )
 ON CONFLICT DO NOTHING
 RETURNING 1
@@ -305,7 +301,11 @@
 				convert(measure.Value_min)
 				convert(measure.Value_max)
 
-				isWaterlevel := *measure.Measure_code == nts.Measure_code_enumWAL
+				if *measure.Measure_code != nts.Measure_code_enumWAL {
+					feedback.Warn("Ignored message with measure_code %s",
+						*measure.Measure_code)
+					continue
+				}
 
 				if measure.Predicted {
 					var confInterval pgtype.Numrange
@@ -335,7 +335,6 @@
 						msg.Identification.Date_issue,
 						referenceCode,
 						measure.Value,
-						isWaterlevel,
 						&confInterval,
 						msg.Identification.Date_issue,
 						msg.Identification.Originator,
@@ -363,7 +362,6 @@
 						msg.Identification.Date_issue,
 						referenceCode,
 						measure.Value,
-						isWaterlevel,
 						msg.Identification.Date_issue,
 						msg.Identification.Originator,
 					).Scan(&dummy)