Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 3940:aed7aba93718 | 3941:3de4ac5ccee8 |
|---|---|
| 47 public static final String FRACTION_SUSP_SAND_BED = | 47 public static final String FRACTION_SUSP_SAND_BED = |
| 48 "_susp_Sand_bettbildAnteil.csv"; | 48 "_susp_Sand_bettbildAnteil.csv"; |
| 49 | 49 |
| 50 public static final String FRACTION_SUSPENDED_SEDIMENT = | 50 public static final String FRACTION_SUSPENDED_SEDIMENT = |
| 51 "_Schwebstoff.csv"; | 51 "_Schwebstoff.csv"; |
| 52 | |
| 53 public static final String FRACTION_TOTAL = | |
| 54 "_gesamt.csv"; | |
| 52 | 55 |
| 53 | 56 |
| 54 public static final Pattern TIMEINTERVAL_SINGLE = | 57 public static final Pattern TIMEINTERVAL_SINGLE = |
| 55 Pattern.compile("\\D*([0-9]+?)\\D*"); | 58 Pattern.compile("\\D*([0-9]+?)\\D*"); |
| 56 | 59 |
| 374 return GrainFraction.SUSP_SAND_BED; | 377 return GrainFraction.SUSP_SAND_BED; |
| 375 } | 378 } |
| 376 else if (filename.endsWith(FRACTION_SUSPENDED_SEDIMENT)) { | 379 else if (filename.endsWith(FRACTION_SUSPENDED_SEDIMENT)) { |
| 377 return GrainFraction.SUSPENDED_SEDIMENT; | 380 return GrainFraction.SUSPENDED_SEDIMENT; |
| 378 } | 381 } |
| 382 else if (filename.endsWith(FRACTION_TOTAL)) { | |
| 383 return GrainFraction.TOTAL; | |
| 384 } | |
| 379 else { | 385 else { |
| 380 log.warn("SYP: Unknown grain fraction '" + filename + "'"); | 386 log.warn("SYP: Unknown grain fraction '" + filename + "'"); |
| 381 return "unknown"; | 387 return "unknown"; |
| 382 } | 388 } |
| 383 } | 389 } |