[Dive4elements-commits] [PATCH] ETL: Do not ignore open ended discharge tables

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1367949228 -7200
# Node ID c73977be1795f180c976d8fefe48d8346380077a
# Parent  d6bf8353e0fced47941b7562e17d92a1ade0771e
ETL: Do not ignore open ended discharge tables.

diff -r d6bf8353e0fc -r c73977be1795 etl/src/main/java/org/dive4elements/river/etl/aft/DischargeTable.java
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/DischargeTable.java	Tue May 07 19:07:08 2013 +0200
+++ b/etl/src/main/java/org/dive4elements/river/etl/aft/DischargeTable.java	Tue May 07 19:53:48 2013 +0200
@@ -265,18 +265,10 @@
                 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) {
+                if (to != null && from.after(to)) {
                         log.warn("AFT: ABFLUSSTAFEL_NR = "
                         + dtId + ": " + from + " > " + to + ". -> swap");
                     Date temp = from;
diff -r d6bf8353e0fc -r c73977be1795 etl/src/main/java/org/dive4elements/river/etl/aft/TimeInterval.java
--- a/etl/src/main/java/org/dive4elements/river/etl/aft/TimeInterval.java	Tue May 07 19:07:08 2013 +0200
+++ b/etl/src/main/java/org/dive4elements/river/etl/aft/TimeInterval.java	Tue May 07 19:53:48 2013 +0200
@@ -71,6 +71,7 @@
         this.stop = stop;
     }
 
+    @Override
     public String toString() {
         return "[TimeInterval: start=" + start + ", stop=" + stop + "]";
     }