changeset 6027:231baa52daa3

Sediment yield parser: be more flexible when looking for grain fraction in filename
author Tom Gottfried <tom.gottfried@intevation.de>
date Wed, 15 May 2013 16:23:20 +0200 (2013-05-15)
parents 3e539a0670c7
children 25d927cb4b25
files backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java	Wed May 15 12:40:13 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java	Wed May 15 16:23:20 2013 +0200
@@ -44,19 +44,19 @@
         ".*Grobkorn.*";
 
     public static final String FRACTION_FINE_MIDDLE_STR =
-        ".*Fein-Mittel-Kies.*";
+        ".*Fein.Mittel.Kies.*";
 
     public static final String FRACTION_SAND =
         ".*Sand.*";
 
     public static final String FRACTION_SUSP_SAND =
-        ".*susp_Sand.*";
+        ".*susp.Sand.*";
 
     public static final String FRACTION_SUSP_SAND_BED =
-        ".*bettbild_Anteil_susp_Sand.*";
+        ".*bettbild.Anteil.susp.Sand.*";
 
     public static final String FRACTION_SUSP_SAND_BED_EPOCH =
-        ".*susp_Sand_bettbildAnteil.*";
+        ".*susp.Sand.bettbildAnteil.*";
 
     public static final String FRACTION_SUSPENDED_SEDIMENT =
         ".*Schwebstoff.*";

http://dive4elements.wald.intevation.org