Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java @ 7917:9ec6def1a7dd
Make grain fraction type 'unknown' explicit and use it where appropriate.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 05 Jun 2014 15:32:52 +0200 |
| parents | c894b7b45c4c |
| children | 07cc4cd9233e |
comparison
equal
deleted
inserted
replaced
| 7916:c0843a658474 | 7917:9ec6def1a7dd |
|---|---|
| 188 } | 188 } |
| 189 else if (line.startsWith(FRAKTION_START)) { | 189 else if (line.startsWith(FRAKTION_START)) { |
| 190 String newLine = line.replace(FRAKTION_START, "").trim(); | 190 String newLine = line.replace(FRAKTION_START, "").trim(); |
| 191 if (newLine.length() == 0) { | 191 if (newLine.length() == 0) { |
| 192 log.debug("Found total grain fraction."); | 192 log.debug("Found total grain fraction."); |
| 193 this.grainFraction = new ImportGrainFraction(GrainFraction.TOTAL); | 193 this.grainFraction = new ImportGrainFraction(GrainFraction.UNKNOWN); |
| 194 | 194 |
| 195 return true; | 195 return true; |
| 196 } | 196 } |
| 197 } | 197 } |
| 198 | 198 |
| 370 log.warn("SYP: Could not parse ranges of: '" + gfStr + "'"); | 370 log.warn("SYP: Could not parse ranges of: '" + gfStr + "'"); |
| 371 } | 371 } |
| 372 } | 372 } |
| 373 | 373 |
| 374 log.warn("SYP: Unknown grain fraction: '" + gfStr + "'"); | 374 log.warn("SYP: Unknown grain fraction: '" + gfStr + "'"); |
| 375 | 375 return new ImportGrainFraction(GrainFraction.UNKNOWN); |
| 376 return null; | |
| 377 } | 376 } |
| 378 | 377 |
| 379 | 378 |
| 380 public static String getGrainFractionTypeName(String filename) { | 379 public static String getGrainFractionTypeName(String filename) { |
| 381 if (Pattern.matches(FRACTION_COARSE_STR, filename)) { | 380 if (Pattern.matches(FRACTION_COARSE_STR, filename)) { |
| 400 else if (Pattern.matches(FRACTION_TOTAL, filename)) { | 399 else if (Pattern.matches(FRACTION_TOTAL, filename)) { |
| 401 return GrainFraction.TOTAL; | 400 return GrainFraction.TOTAL; |
| 402 } | 401 } |
| 403 else { | 402 else { |
| 404 log.warn("SYP: Unknown grain fraction '" + filename + "'"); | 403 log.warn("SYP: Unknown grain fraction '" + filename + "'"); |
| 405 return "unknown"; | 404 return GrainFraction.UNKNOWN; |
| 406 } | 405 } |
| 407 } | 406 } |
| 408 | 407 |
| 409 | 408 |
| 410 public List<ImportSedimentYield> getSedimentYields() { | 409 public List<ImportSedimentYield> getSedimentYields() { |