Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/parsers/WstParser.java @ 5558:b223be96758c
Merged
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Thu, 04 Apr 2013 15:28:33 +0200 |
| parents | 12f4d088f088 |
| children | 202a73ce6704 |
comparison
equal
deleted
inserted
replaced
| 5557:fd7285e3829b | 5558:b223be96758c |
|---|---|
| 258 " (" + collision + ")"; | 258 " (" + collision + ")"; |
| 259 ++collision; | 259 ++collision; |
| 260 } | 260 } |
| 261 ImportWstColumn iwc = wst.getColumn(i); | 261 ImportWstColumn iwc = wst.getColumn(i); |
| 262 iwc.setName(candidate); | 262 iwc.setName(candidate); |
| 263 iwc.setTimeInterval(guessDate(candidate)); | 263 String potentialDate = daten != null && i < daten.length |
| 264 ? daten[i] | |
| 265 : candidate; | |
| 266 iwc.setTimeInterval(guessDate(potentialDate)); | |
| 264 } | 267 } |
| 265 columnHeaderChecked = true; | 268 columnHeaderChecked = true; |
| 266 } | 269 } |
| 267 | 270 |
| 268 BigDecimal [] data = | 271 BigDecimal [] data = |