changeset 5393:4319b1289592

Bed height single import: give more informative warnings
author Tom Gottfried <tom.gottfried@intevation.de>
date Mon, 25 Mar 2013 11:52:44 +0100
parents 95050a944d81
children 9207142726b3
files flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java
diffstat 1 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java	Mon Mar 25 10:22:48 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java	Mon Mar 25 11:52:44 2013 +0100
@@ -140,8 +140,21 @@
             ElevationModel theCurModel = curElevationModel.getPeer();
             Range          theRange    = range != null ? range.getPeer(river) : null;
 
-            if (theType == null || theCurModel == null || theRange == null) {
-                log.warn("BHS: Skip invalid file '" + description + "'");
+            if (theType == null) {
+                log.warn("BHS: No bed height type given. Skip file '" + 
+			 description + "'");
+                return null;
+            }
+
+            if (theCurModel == null) {
+                log.warn("BHS: No elevation model given. Skip file '" + 
+			 description + "'");
+                return null;
+            }
+
+            if (theRange == null) {
+                log.warn("BHS: No km-range given. Skip file '" + 
+			 description + "'");
                 return null;
             }
 

http://dive4elements.wald.intevation.org