Mercurial > gemma

diff pkg/imports/bn.go @ 4058:6c5c15b2fb64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 aa7bede70b96
children 6c760abcff0e
line wrap: on
line diff
--- a/pkg/imports/bn.go	Thu Jul 25 08:16:34 2019 +0200
+++ b/pkg/imports/bn.go	Thu Jul 25 09:12:53 2019 +0200
@@ -24,6 +24,7 @@
 	"strings"
 	"time"
 
+	"gemma.intevation.de/gemma/pkg/common"
 	"gemma.intevation.de/gemma/pkg/soap/ifbn"
 	"github.com/jackc/pgx/pgtype"
 )
@@ -590,7 +591,7 @@
 		)
 	}
 	if err != nil {
-		feedback.Warn(handleError(err).Error())
+		feedback.Warn(common.HandlePGError(err).Error())
 		return nil
 	}
 	defer bns.Close()
@@ -602,7 +603,7 @@
 		bnIds = append(bnIds, nid)
 	}
 	if err := bns.Err(); err != nil {
-		feedback.Warn(handleError(err).Error())
+		feedback.Warn(common.HandlePGError(err).Error())
 		return nil
 	}
 	if len(bnIds) == 0 {
@@ -619,7 +620,7 @@
 		&validity,
 		&pgBnIds,
 	); err != nil {
-		feedback.Warn(handleError(err).Error())
+		feedback.Warn(common.HandlePGError(err).Error())
 		if err2 := tx.Rollback(); err2 != nil {
 			return err2
 		}
@@ -632,7 +633,7 @@
 		bn.Bottleneck_id,
 		validity,
 	); err != nil {
-		feedback.Warn(handleError(err).Error())
+		feedback.Warn(common.HandlePGError(err).Error())
 		if err2 := tx.Rollback(); err2 != nil {
 			return err2
 		}
@@ -669,7 +670,7 @@
 			&pgMaterials,
 		); err != nil {
 			feedback.Warn("Failed to insert riverbed materials")
-			feedback.Warn(handleError(err).Error())
+			feedback.Warn(common.HandlePGError(err).Error())
 			return nil
 		}
 	}