Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java @ 2598:e96bf6c47c12
Improved selecting discharge tables for historical discharge calculation.
flys-artifacts/trunk@4169 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 20 Mar 2012 11:34:44 +0000 |
| parents | 2966787b5188 |
| children | 4bd3d8bbb60c |
comparison
equal
deleted
inserted
replaced
| 2597:b61357384a7a | 2598:e96bf6c47c12 |
|---|---|
| 77 | 77 |
| 78 List<DischargeTable> tables =gauge.getDischargeTables(); | 78 List<DischargeTable> tables =gauge.getDischargeTables(); |
| 79 | 79 |
| 80 Element all = result.createElement("discharges"); | 80 Element all = result.createElement("discharges"); |
| 81 for (DischargeTable dt: tables) { | 81 for (DischargeTable dt: tables) { |
| 82 if (dt.getKind() == Gauge.MASTER_DISCHARGE_TABLE) { | |
| 83 continue; | |
| 84 } | |
| 85 | |
| 82 Element discharge = result.createElement("discharge"); | 86 Element discharge = result.createElement("discharge"); |
| 83 discharge.setAttribute("description", dt.getDescription()); | 87 discharge.setAttribute("description", dt.getDescription()); |
| 84 | 88 |
| 85 // Get time interval. | 89 // Get time interval. |
| 86 TimeInterval ti = dt.getTimeInterval(); | 90 TimeInterval ti = dt.getTimeInterval(); |
| 91 | |
| 92 if (ti == null) { | |
| 93 logger.warn("DischargeTable has no TimeInterval set!"); | |
| 94 continue; | |
| 95 } | |
| 96 | |
| 87 Date startTime = ti.getStartTime(); | 97 Date startTime = ti.getStartTime(); |
| 88 Date stopTime = ti.getStopTime(); | 98 Date stopTime = ti.getStopTime(); |
| 89 | 99 |
| 90 // Get the year for start end end date. | 100 // Get the year for start end end date. |
| 91 int startYear; | 101 int startYear; |