# HG changeset patch # User Tom Gottfried # Date 1368627800 -7200 # Node ID 231baa52daa3457fce6500733f813253b4aed230 # Parent 3e539a0670c7173482ddf283c5536ed7799b742a Sediment yield parser: be more flexible when looking for grain fraction in filename diff -r 3e539a0670c7 -r 231baa52daa3 backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java --- 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.*";