Mercurial > gemma

changeset 2238:4ca41516115b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Gauge measurement import: More idiomatic code.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 13 Feb 2019 14:38:28 +0100
parents 9b2f8e94671e
children 3fce60e34395
files pkg/imports/gm.go
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/gm.go	Wed Feb 13 12:45:48 2019 +0100
+++ b/pkg/imports/gm.go	Wed Feb 13 14:38:28 2019 +0100
@@ -265,12 +265,8 @@
 	var gids []string
 	for _, g := range gauges {
 
-		var idPair []*nts.Id_pair
-		isrs := g.location.String()
-		isrsID := nts.Isrs_code_type(isrs)
-		idPair = append(idPair, &nts.Id_pair{
-			Id: &isrsID,
-		})
+		isrsID := nts.Isrs_code_type(g.location.String())
+		idPair := []*nts.Id_pair{{Id: &isrsID}}
 
 		req := &nts.Get_messages_query{
 			Message_type: &mt,
@@ -279,14 +275,13 @@
 
 		resp, err := client.Get_messages(req)
 		if err != nil {
-			feedback.Error("%v", err)
 			return nil, err
 		}
 
 		if resp.Result_message == nil {
 			for _, e := range resp.Result_error {
 				if e != nil {
-					feedback.Error("No gauge measurements found for %s", g.location.String())
+					feedback.Error("No gauge measurements found for %s", g.location)
 				} else {
 					feedback.Error("unknown")
 				}
@@ -297,7 +292,7 @@
 
 		for _, msg := range result {
 			var gid int64
-			feedback.Info("Found measurements for %s", g.location.String())
+			feedback.Info("Found measurements for %s", g.location)
 			for _, wrm := range msg.Wrm {
 				currIsrs, err := models.IsrsFromString(string(*wrm.Geo_object.Id))
 				if err != nil {