# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1347964304 0
# Node ID 3de4ac5ccee8a197fbe0846adc50687d6bbcdc37
# Parent  aed7aba93718033c201cdf14a598db88d735906b
Added missing GrainFraction type to parser; accept 'Querprofil' as valid BedHeightType during MINFO import.

flys-backend/trunk@5503 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r aed7aba93718 -r 3de4ac5ccee8 flys-backend/ChangeLog
--- a/flys-backend/ChangeLog	Tue Sep 18 04:20:33 2012 +0000
+++ b/flys-backend/ChangeLog	Tue Sep 18 10:31:44 2012 +0000
@@ -1,3 +1,11 @@
+2012-09-18  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/model/BedHeightType.java: Accept
+	  "Querprofil" as valid BedHeightType.
+
+	* src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java:
+	  Added missing GrainFraction.TOTAL type to parser.
+
 2012-09-18  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java,
diff -r aed7aba93718 -r 3de4ac5ccee8 flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java	Tue Sep 18 04:20:33 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java	Tue Sep 18 10:31:44 2012 +0000
@@ -50,6 +50,9 @@
     public static final String FRACTION_SUSPENDED_SEDIMENT =
         "_Schwebstoff.csv";
 
+    public static final String FRACTION_TOTAL =
+        "_gesamt.csv";
+
 
     public static final Pattern TIMEINTERVAL_SINGLE =
         Pattern.compile("\\D*([0-9]+?)\\D*");
@@ -376,6 +379,9 @@
         else if (filename.endsWith(FRACTION_SUSPENDED_SEDIMENT)) {
             return GrainFraction.SUSPENDED_SEDIMENT;
         }
+        else if (filename.endsWith(FRACTION_TOTAL)) {
+            return GrainFraction.TOTAL;
+        }
         else {
             log.warn("SYP: Unknown grain fraction '" + filename + "'");
             return "unknown";
diff -r aed7aba93718 -r 3de4ac5ccee8 flys-backend/src/main/java/de/intevation/flys/model/BedHeightType.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/BedHeightType.java	Tue Sep 18 04:20:33 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/BedHeightType.java	Tue Sep 18 10:31:44 2012 +0000
@@ -76,6 +76,9 @@
         else if ("Querprofile".equals(description)) {
             return "QP";
         }
+        else if ("Querprofil".equals(description)) {
+            return "QP";
+        }
         else if ("TIN".equals(description)) {
             return "TIN";
         }