gemma: pkg/imports/wa.go comparison

Waterway area import: do not fail if INSERT of one item fails

author	Tom Gottfried <tom@intevation.de>
date	Thu, 14 Mar 2019 18:09:35 +0100
parents	9b6a02923bb4
children	542d3441c2d8

comparison

equal deleted inserted replaced

-:74031fbd3d50
+:00b0a7b2225a
 			return nil
 		}
 		feedback.Info("Using EPSG: %d", epsg)
+		const featureSavepoint = "feature"
 		for _, feature := range rfc.Features {
 			if feature.Properties == nil || feature.Geometry.Coordinates == nil {
 				missingProperties++
 				continue
 			}
 			switch feature.Geometry.Type {
 			case "Polygon":
 				var p polygonSlice
 				if err := json.Unmarshal(*feature.Geometry.Coordinates, &p); err != nil {
+					return err
+				}
+				if err := Savepoint(tx, ctx, featureSavepoint); err != nil {
 					return err
 				}
 				if _, err := insertStmt.ExecContext(
 					ctx,
 					p.asWKB(),
 					epsg,
 					catccl,
 					dirimp,
 				); err != nil {
-					return err
+					feedback.Warn(handleError(err).Error())
-				}
+					if err = RollbackToSavepoint(tx, ctx, featureSavepoint); err != nil {
-				features++
+						return err
+					}
+				} else {
+					if err = ReleaseSavepoint(tx, ctx, featureSavepoint); err != nil {
+						return err
+					}
+					features++
+				}
 			default:
 				unsupported[feature.Geometry.Type]++
 			}
 		}
 		return nil

Mercurial > gemma