Mercurial > gemma
diff pkg/imports/wg.go @ 5683:31973f6f5cca sr-v2
Get rid of deprecation warnings from staticcheck.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Sun, 11 Feb 2024 21:37:00 +0100 |
parents | b75d0b303328 |
children | 2dd155cc95ec |
line wrap: on
line diff
--- a/pkg/imports/wg.go Sun Feb 11 21:26:22 2024 +0100 +++ b/pkg/imports/wg.go Sun Feb 11 21:37:00 2024 +0100 @@ -180,7 +180,7 @@ ` ) -var continueErr = errors.New("continue") +var errContinue = errors.New("continue") // Do implements the actual import. func (wg *WaterwayGauge) Do( @@ -361,7 +361,7 @@ case err != nil: feedback.Error(pgxutils.ReadableError{Err: err}.Error()) unchanged++ - return continueErr + return errContinue case isNew: var lu *time.Time if dr.Lastupdate != nil { @@ -388,7 +388,7 @@ ); err != nil { key := pgxutils.ReadableError{Err: err}.Error() databaseErrors[key] = append(databaseErrors[key], isrs) - return continueErr + return errContinue } newGauges = append(newGauges, isrs) //feedback.Info("insert new version") @@ -417,12 +417,12 @@ case err2 == sql.ErrNoRows: //feedback.Info("unchanged") unchanged++ - return continueErr + return errContinue case err2 != nil: key := pgxutils.ReadableError{Err: err2}.Error() databaseErrors[key] = append(databaseErrors[key], isrs) unchanged++ - return continueErr + return errContinue default: updatedGauges = append(updatedGauges, isrs) //feedback.Info("update") @@ -477,7 +477,7 @@ key := pgxutils.ReadableError{Err: err}.Error() databaseErrors[key] = append(databaseErrors[key], isrs) unchanged++ - return continueErr + return errContinue } // "Upsert" reference water levels @@ -529,7 +529,7 @@ return tx.Commit() }() - if err != nil && err != continueErr { + if err != nil && err != errContinue { return err, nil } }