Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java @ 6505:128ab9169db1 double-precision
merged changes from default into double-precision branch
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Fri, 28 Jun 2013 17:03:48 +0200 |
| parents | 55a2f9e0d6ab 7664ab97b4c7 |
| children | f4fb7e38a288 |
comparison
equal
deleted
inserted
replaced
| 6503:9daf7c9cf663 | 6505:128ab9169db1 |
|---|---|
| 114 int columnCount = 0; | 114 int columnCount = 0; |
| 115 | 115 |
| 116 String [] lsBezeichner = null; | 116 String [] lsBezeichner = null; |
| 117 String [] langBezeichner = null; | 117 String [] langBezeichner = null; |
| 118 int [] colNaWidths = null; | 118 int [] colNaWidths = null; |
| 119 // String [] quellen = null; | 119 String [] quellen = null; |
| 120 String [] daten = null; | 120 String [] daten = null; |
| 121 | 121 |
| 122 BigDecimal [] aktAbfluesse = null; | 122 BigDecimal [] aktAbfluesse = null; |
| 123 BigDecimal [] firstAbfluesse = null; | 123 BigDecimal [] firstAbfluesse = null; |
| 124 | 124 |
| 218 } | 218 } |
| 219 else if (spezial.startsWith(COLUMN_QUELLE)) { | 219 else if (spezial.startsWith(COLUMN_QUELLE)) { |
| 220 if (spezial.length() == 0) { | 220 if (spezial.length() == 0) { |
| 221 continue; | 221 continue; |
| 222 } | 222 } |
| 223 // quellen = StringUtil.splitQuoted(spezial, '"'); | 223 quellen = StringUtil.splitQuoted(spezial, '"'); |
| 224 } | 224 } |
| 225 else if (spezial.startsWith(COLUMN_DATUM)) { | 225 else if (spezial.startsWith(COLUMN_DATUM)) { |
| 226 spezial = spezial.substring(COLUMN_DATUM.length()).trim(); | 226 spezial = spezial.substring(COLUMN_DATUM.length()).trim(); |
| 227 if (spezial.length() == 0) { | 227 if (spezial.length() == 0) { |
| 228 continue; | 228 continue; |
| 281 " (" + collision + ")"; | 281 " (" + collision + ")"; |
| 282 ++collision; | 282 ++collision; |
| 283 } | 283 } |
| 284 ImportWstColumn iwc = wst.getColumn(i); | 284 ImportWstColumn iwc = wst.getColumn(i); |
| 285 iwc.setName(candidate); | 285 iwc.setName(candidate); |
| 286 if (quellen != null && i < quellen.length) { | |
| 287 iwc.setSource(quellen[i]); | |
| 288 } | |
| 286 String potentialDate = daten != null && i < daten.length | 289 String potentialDate = daten != null && i < daten.length |
| 287 ? daten[i] | 290 ? daten[i] |
| 288 : candidate; | 291 : candidate; |
| 289 iwc.setTimeInterval(guessDate(potentialDate)); | 292 iwc.setTimeInterval(guessDate(potentialDate)); |
| 290 } | 293 } |