Mercurial > dive4elements > river
comparison flys-aft/src/main/java/de/intevation/aft/River.java @ 4736:b195fede1c3b
Remove trailing whitespace.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Wed, 02 Jan 2013 13:18:31 +0100 |
parents | 79bb64f66c74 |
children | a310aceb2e51 |
comparison
equal
deleted
inserted
replaced
4735:94b39073f0f7 | 4736:b195fede1c3b |
---|---|
66 continue; | 66 continue; |
67 } | 67 } |
68 String gaugeRiver = dipsGauge.getRiverName(); | 68 String gaugeRiver = dipsGauge.getRiverName(); |
69 if (!gaugeRiver.equalsIgnoreCase(riverName)) { | 69 if (!gaugeRiver.equalsIgnoreCase(riverName)) { |
70 log.warn( | 70 log.warn( |
71 "DIPS: MESSSTELLE '" + name + | 71 "DIPS: MESSSTELLE '" + name + |
72 "' is assigned to river '" + gaugeRiver + | 72 "' is assigned to river '" + gaugeRiver + |
73 "'. Needs to be on '" + riverName + "'."); | 73 "'. Needs to be on '" + riverName + "'."); |
74 continue; | 74 continue; |
75 } | 75 } |
76 dipsGauge.setAftName(name); | 76 dipsGauge.setAftName(name); |
77 dipsGauge.setOfficialNumber(number); | 77 dipsGauge.setOfficialNumber(number); |
90 while (gaugesRs.next()) { | 90 while (gaugesRs.next()) { |
91 int gaugeId = gaugesRs.getInt("id"); | 91 int gaugeId = gaugesRs.getInt("id"); |
92 String name = gaugesRs.getString("name"); | 92 String name = gaugesRs.getString("name"); |
93 long number = gaugesRs.getLong("official_number"); | 93 long number = gaugesRs.getLong("official_number"); |
94 if (gaugesRs.wasNull()) { | 94 if (gaugesRs.wasNull()) { |
95 log.warn("FLYS: Gauge '" + name + | 95 log.warn("FLYS: Gauge '" + name + |
96 "' has no official number. Ignored."); | 96 "' has no official number. Ignored."); |
97 continue; | 97 continue; |
98 } | 98 } |
99 Long key = Long.valueOf(number); | 99 Long key = Long.valueOf(number); |
100 DIPSGauge aftDIPSGauge = aftDIPSGauges.remove(key); | 100 DIPSGauge aftDIPSGauge = aftDIPSGauges.remove(key); |
160 new HashMap<String, DischargeTable>(); | 160 new HashMap<String, DischargeTable>(); |
161 | 161 |
162 for (DischargeTable dt: flysDTs) { | 162 for (DischargeTable dt: flysDTs) { |
163 String description = dt.getDescription(); | 163 String description = dt.getDescription(); |
164 if (description == null) { | 164 if (description == null) { |
165 log.warn("FLYS: discharge table " + dt.getId() | 165 log.warn("FLYS: discharge table " + dt.getId() |
166 + " has no description. Ignored."); | 166 + " has no description. Ignored."); |
167 continue; | 167 continue; |
168 } | 168 } |
169 desc2FlysDT.put(description, dt); | 169 desc2FlysDT.put(description, dt); |
170 } | 170 } |
252 | 252 |
253 log.info("Gauge '" + gauge.getAftName() + | 253 log.info("Gauge '" + gauge.getAftName() + |
254 "' not in FLYS but in AFT/DIPS. -> Create"); | 254 "' not in FLYS but in AFT/DIPS. -> Create"); |
255 | 255 |
256 if (!gauge.hasDatums()) { | 256 if (!gauge.hasDatums()) { |
257 log.warn("DIPS: Gauge '" + | 257 log.warn("DIPS: Gauge '" + |
258 gauge.getAftName() + "' has no datum. Ignored."); | 258 gauge.getAftName() + "' has no datum. Ignored."); |
259 continue; | 259 continue; |
260 } | 260 } |
261 | 261 |
262 ResultSet rs = null; | 262 ResultSet rs = null; |
276 .setLong("official_number", officialNumber) | 276 .setLong("official_number", officialNumber) |
277 .setDouble("datum", gauge.getLatestDatum().getValue()); | 277 .setDouble("datum", gauge.getLatestDatum().getValue()); |
278 | 278 |
279 insertStmnt.execute(); | 279 insertStmnt.execute(); |
280 | 280 |
281 log.info("FLYS: Created gauge '" + gauge.getAftName() + | 281 log.info("FLYS: Created gauge '" + gauge.getAftName() + |
282 "' with id " + gaugeId + "."); | 282 "' with id " + gaugeId + "."); |
283 | 283 |
284 gauge.setFlysId(gaugeId); | 284 gauge.setFlysId(gaugeId); |
285 createDischargeTables(context, gauge); | 285 createDischargeTables(context, gauge); |
286 flysStatements.commitTransaction(); | 286 flysStatements.commitTransaction(); |