Mercurial > dive4elements > river
diff 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 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java Tue Mar 20 07:38:48 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java Tue Mar 20 11:34:44 2012 +0000 @@ -79,11 +79,21 @@ Element all = result.createElement("discharges"); for (DischargeTable dt: tables) { + if (dt.getKind() == Gauge.MASTER_DISCHARGE_TABLE) { + continue; + } + Element discharge = result.createElement("discharge"); discharge.setAttribute("description", dt.getDescription()); // Get time interval. TimeInterval ti = dt.getTimeInterval(); + + if (ti == null) { + logger.warn("DischargeTable has no TimeInterval set!"); + continue; + } + Date startTime = ti.getStartTime(); Date stopTime = ti.getStopTime();