# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1550073136 -3600
# Node ID 35db2e11c966b361ba890a6989d1ba9e80b9e487
# Parent  cce158db02b05a95f677ae58ffe22424484c850f
Uploaded gauge measurement: Implemented in terms of normal gauge measurement import.

diff -r cce158db02b0 -r 35db2e11c966 pkg/controllers/routes.go
--- a/pkg/controllers/routes.go	Wed Feb 13 16:48:52 2019 +0100
+++ b/pkg/controllers/routes.go	Wed Feb 13 16:52:16 2019 +0100
@@ -211,6 +211,9 @@
 	api.Handle("/imports/ufa", waterwayAdmin(
 		http.HandlerFunc(importUploadedFairwayAvailability))).Methods(http.MethodPost)
 
+	api.Handle("/imports/ugm", waterwayAdmin(
+		http.HandlerFunc(importUploadedGaugeMeasurement))).Methods(http.MethodPost)
+
 	api.Handle("/imports/{kind:st}", sysAdmin(&JSONHandler{
 		Input:  importModel,
 		Handle: manualImport,
diff -r cce158db02b0 -r 35db2e11c966 pkg/imports/ugm.go
--- a/pkg/imports/ugm.go	Wed Feb 13 16:48:52 2019 +0100
+++ b/pkg/imports/ugm.go	Wed Feb 13 16:52:16 2019 +0100
@@ -24,7 +24,7 @@
 	"gemma.intevation.de/gemma/pkg/soap/nts"
 )
 
-type UploadGaugeMeasurement struct {
+type UploadedGaugeMeasurement struct {
 	Dir string `json:"dir"`
 }
 
@@ -36,7 +36,7 @@
 
 func (ugmJobCreator) Description() string { return "uploaded gauge measurements" }
 
-func (ugmJobCreator) Create() Job { return new(UploadGaugeMeasurement) }
+func (ugmJobCreator) Create() Job { return new(UploadedGaugeMeasurement) }
 
 func (ugmJobCreator) Depends() []string { return gmJobCreator{}.Depends() }
 
@@ -44,10 +44,10 @@
 
 func (ugmJobCreator) StageDone(context.Context, *sql.Tx, int64) error { return nil }
 
-func (ugm *UploadGaugeMeasurement) CleanUp() error { return os.RemoveAll(ugm.Dir) }
+func (ugm *UploadedGaugeMeasurement) CleanUp() error { return os.RemoveAll(ugm.Dir) }
 
-// Do executes the actual bottleneck import.
-func (ugm *UploadGaugeMeasurement) Do(
+// Do executes the actual uploaded gauge measurement import.
+func (ugm *UploadedGaugeMeasurement) Do(
 	ctx context.Context,
 	importID int64,
 	conn *sql.Conn,
@@ -66,12 +66,10 @@
 			return nil, err
 		}
 
-		result := dst.Result_message
-		if len(result) == 0 {
+		if len(dst.Result_message) == 0 {
 			return nil, errors.New("No gauge measurements found")
 		}
-
-		return result, nil
+		return dst.Result_message, nil
 	}
 
 	return storeGaugeMeasurements(