dive4elements/river: flys-aft/src/main/java/de/intevation/aft/DischargeTable.java comparison

AFT: Ignored tables with unset GUELTIG_VON or GUELTIG_BIS values.

author	Sascha L. Teichmann <teichmann@intevation.de>
date	Mon, 15 Oct 2012 12:00:28 +0200
parents	06891562e633
children	79bb64f66c74

comparison

equal deleted inserted replaced

-:c722c08cf502
+:9c78264109ad
 OUTER: while (rs.next()) {
 int  dtId = rs.getInt("ABFLUSSTAFEL_NR");
 Date from = rs.getDate("GUELTIG_VON");
 Date to   = rs.getDate("GUELTIG_BIS");
-if (from != null && to != null && from.compareTo(to) > 0) {
+if (from == null) {
+log.warn("AFT: ABFLUSSTAFEL_NR = "
++ dtId + ": GUELTIG_VON = NULL -> ignored.");
+}
+if (to == null) {
+log.warn("AFT: ABFLUSSTAFEL_NR = "
++ dtId + ": GUELTIG_BIS = NULL -> ignored.");
+}
+if (from == null || to == null) {
+continue;
+}
+if (from.compareTo(to) > 0) {
 log.warn("AFT: ABFLUSSTAFEL_NR = "
 + dtId + ": " + from + " > " + to + ". -> swap");
 Date temp = from;
 from = to;
 to = temp;
 }
 double datumValue = rs.getDouble("PEGELNULLPUNKT");
 Double datum = rs.wasNull() ? null : datumValue;
-TimeInterval timeInterval = from == null
+TimeInterval timeInterval = new TimeInterval(from, to);
-? null
-: new TimeInterval(from, to);
 DischargeTable dt = new DischargeTable(
 dtId,
 flysGaugeId,
 timeInterval,

Mercurial > dive4elements > river