Mercurial > gemma
diff pkg/imports/wg.go @ 4058:6c5c15b2fb64
Database errors have to be handled elsewhere than in imports, too
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Thu, 25 Jul 2019 09:12:53 +0200 |
parents | 29ef6d41e4af |
children | 6c760abcff0e |
line wrap: on
line diff
--- a/pkg/imports/wg.go Thu Jul 25 08:16:34 2019 +0200 +++ b/pkg/imports/wg.go Thu Jul 25 09:12:53 2019 +0200 @@ -21,6 +21,7 @@ "github.com/jackc/pgx/pgtype" + "gemma.intevation.de/gemma/pkg/common" "gemma.intevation.de/gemma/pkg/models" "gemma.intevation.de/gemma/pkg/soap/erdms" ) @@ -326,7 +327,7 @@ ).Scan(&isNew) switch { case err != nil: - feedback.Warn(handleError(err).Error()) + feedback.Warn(common.HandlePGError(err).Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -351,7 +352,7 @@ source, time.Time(*dr.Lastupdate), ); err != nil { - feedback.Warn(handleError(err).Error()) + feedback.Warn(common.HandlePGError(err).Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -388,7 +389,7 @@ unchanged++ continue case err2 != nil: - feedback.Warn(handleError(err2).Error()) + feedback.Warn(common.HandlePGError(err2).Error()) if err3 := tx.Rollback(); err3 != nil { return nil, err3 } @@ -435,7 +436,7 @@ code.String(), &validity, ); err != nil { - feedback.Warn(handleError(err).Error()) + feedback.Warn(common.HandlePGError(err).Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -483,7 +484,7 @@ string(**wl.level), int64(**wl.value), ); err != nil { - feedback.Warn(handleError(err).Error()) + feedback.Warn(common.HandlePGError(err).Error()) tx.Rollback() continue }