Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java @ 5262:0d9ad1c432b8
ImportRiver: Cosmetics, resolved todo.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 13 Mar 2013 09:21:35 +0100 |
| parents | 1e403a0efc21 |
| children | dba703edfff1 |
comparison
equal
deleted
inserted
replaced
| 5261:1e403a0efc21 | 5262:0d9ad1c432b8 |
|---|---|
| 550 File wspDir = new File(fixDir, MINFO_WATERLEVELS_DIR); | 550 File wspDir = new File(fixDir, MINFO_WATERLEVELS_DIR); |
| 551 | 551 |
| 552 File[] files = wspDir.listFiles(); | 552 File[] files = wspDir.listFiles(); |
| 553 | 553 |
| 554 if (files == null) { | 554 if (files == null) { |
| 555 log.warn("Cannot read directory '" + wspDir + "'"); | 555 log.warn("Cannot read directory for wl '" + wspDir + "'"); |
| 556 return; | 556 return; |
| 557 } | 557 } |
| 558 | 558 |
| 559 WaterlevelParser parser = new WaterlevelParser(); | 559 WaterlevelParser parser = new WaterlevelParser(); |
| 560 | 560 |
| 561 for (File file: files) { | 561 for (File file: files) { |
| 562 parser.parse(file); | 562 parser.parse(file); |
| 563 } | 563 } |
| 564 | 564 |
| 565 // TODO use own List<ImportWst> for waterlevels | |
| 566 // The parsed ImportWaterlevels are converted to | 565 // The parsed ImportWaterlevels are converted to |
| 567 // 'fixation'-wsts now. | 566 // 'fixation'-wsts now. |
| 568 for(ImportWst iw: parser.getWaterlevels()) { | 567 for(ImportWst iw: parser.getWaterlevels()) { |
| 569 iw.setDescription("CSV/" + iw.getDescription()); | 568 iw.setDescription("CSV/" + iw.getDescription()); |
| 570 iw.setKind(6); | 569 iw.setKind(6); |
| 1129 wst.storeDependencies(river); | 1128 wst.storeDependencies(river); |
| 1130 } | 1129 } |
| 1131 } | 1130 } |
| 1132 | 1131 |
| 1133 public void storeFixations() { | 1132 public void storeFixations() { |
| 1134 if (!Config.INSTANCE.skipFixations() || !Config.INSTANCE.skipWaterlevels()) { | 1133 if (!Config.INSTANCE.skipFixations()) { |
| 1135 log.info("store fixation wsts and/or csvs"); | 1134 log.info("store fixation wsts"); |
| 1136 River river = getPeer(); | 1135 River river = getPeer(); |
| 1137 for (ImportWst fWst: fixations) { | 1136 for (ImportWst fWst: fixations) { |
| 1138 log.debug("Fixation name: " + fWst.getDescription()); | 1137 log.debug("Fixation name: " + fWst.getDescription()); |
| 1139 fWst.storeDependencies(river); | 1138 fWst.storeDependencies(river); |
| 1140 } | 1139 } |
| 1143 | 1142 |
| 1144 | 1143 |
| 1145 /** Store wsts from waterlevel-csv files. */ | 1144 /** Store wsts from waterlevel-csv files. */ |
| 1146 public void storeWaterlevels() { | 1145 public void storeWaterlevels() { |
| 1147 if (!Config.INSTANCE.skipWaterlevels()) | 1146 if (!Config.INSTANCE.skipWaterlevels()) |
| 1148 | 1147 |
| 1149 log.info("store waterlevel wsts from csv"); | 1148 log.info("store waterlevel wsts from csv"); |
| 1150 River river = getPeer(); | 1149 River river = getPeer(); |
| 1151 for (ImportWst wWst: waterlevels) { | 1150 for (ImportWst wWst: waterlevels) { |
| 1152 log.debug("Waterlevel name: " + wWst.getDescription()); | 1151 log.debug("Waterlevel name: " + wWst.getDescription()); |
| 1153 wWst.storeDependencies(river); | 1152 wWst.storeDependencies(river); |
| 1154 } | 1153 } |
| 1155 } | 1154 } |
| 1156 | 1155 |
| 1157 | 1156 |
| 1158 /** Store wsts from waterleveldifference-csv files. */ | 1157 /** Store wsts from waterleveldifference-csv files. */ |
| 1159 public void storeWaterlevelDifferences() { | 1158 public void storeWaterlevelDifferences() { |
| 1160 if (!Config.INSTANCE.skipWaterlevelDifferences()) | 1159 if (!Config.INSTANCE.skipWaterlevelDifferences()) |
| 1161 | 1160 |
| 1198 log.debug("name: " + wst.getDescription()); | 1197 log.debug("name: " + wst.getDescription()); |
| 1199 wst.storeDependencies(river); | 1198 wst.storeDependencies(river); |
| 1200 } | 1199 } |
| 1201 } | 1200 } |
| 1202 } | 1201 } |
| 1202 | |
| 1203 | 1203 |
| 1204 public void storeFloodProtection() { | 1204 public void storeFloodProtection() { |
| 1205 if (!Config.INSTANCE.skipFloodProtection()) { | 1205 if (!Config.INSTANCE.skipFloodProtection()) { |
| 1206 log.info("store flood protection wsts"); | 1206 log.info("store flood protection wsts"); |
| 1207 River river = getPeer(); | 1207 River river = getPeer(); |