Mercurial > gemma
changeset 1641:334d13e63342
Cosmetics.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 20 Dec 2018 13:19:54 +0100 |
parents | c0a2e1cd2284 |
children | 49c04bb64e0a |
files | pkg/imports/gm.go pkg/models/gauge.go |
diffstat | 2 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/gm.go Thu Dec 20 12:50:37 2018 +0100 +++ b/pkg/imports/gm.go Thu Dec 20 13:19:54 2018 +0100 @@ -194,9 +194,9 @@ } if resp.Result_message == nil { - err := errors.New("No gauge measurements found") + err := errors.New("no gauge measurements found") for i, e := range resp.Result_error { - feedback.Error("%d: %v", i, string(*e)) + feedback.Error("%d: %v", i, e) } return nil, err } @@ -221,11 +221,12 @@ feedback.Info("Found %d gauges with measurements", len(msg.Wrm)) for _, wrm := range msg.Wrm { currIsrs, err := models.IsrsFromString(string(*wrm.Geo_object.Id)) + if err != nil { + feedback.Warn("Invalid ISRS code %v", err) + continue + } for _, measure := range wrm.Measure { - isWaterlevel := false - if *measure.Measure_code == nts.Measure_code_enumWAL { - isWaterlevel = true - } + isWaterlevel := *measure.Measure_code == nts.Measure_code_enumWAL err = insertStmt.QueryRowContext( ctx, currIsrs.CountryCode, @@ -248,8 +249,9 @@ if err != nil { return nil, err } - feedback.Info("Inserted '%s'", currIsrs) } + feedback.Info("Inserted %d measurements for %s", + len(wrm.Measure), currIsrs) gids = append(gids, currIsrs.String()) } }
--- a/pkg/models/gauge.go Thu Dec 20 12:50:37 2018 +0100 +++ b/pkg/models/gauge.go Thu Dec 20 13:19:54 2018 +0100 @@ -14,6 +14,7 @@ package models import ( + "errors" "fmt" "strconv" "time" @@ -43,7 +44,7 @@ // IsrsFromString converts string representation of isrs code to type Isrs func IsrsFromString(isrsCode string) (*Isrs, error) { if len(isrsCode) < 20 { - return nil, fmt.Errorf("to short") + return nil, errors.New("ISRS code too short") } hm, err := strconv.Atoi(isrsCode[15:20]) if err != nil { @@ -59,7 +60,7 @@ return &isrs, nil } -// ToString creates a isrs code string from Isrs +// String creates a isrs code string from Isrs func (isrs *Isrs) String() string { return fmt.Sprintf("%s%s%s%s%05d", isrs.CountryCode,