Mercurial > dive4elements > river
diff flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java @ 3941:3de4ac5ccee8
Added missing GrainFraction type to parser; accept 'Querprofil' as valid BedHeightType during MINFO import.
flys-backend/trunk@5503 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 18 Sep 2012 10:31:44 +0000 |
| parents | 0d27d02b1208 |
| children | f63b39799d2d |
line wrap: on
line diff
--- 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";