Mercurial > dive4elements > river
changeset 5917:c73977be1795
ETL: Do not ignore open ended discharge tables.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Tue, 07 May 2013 19:53:48 +0200 |
| parents | d6bf8353e0fc |
| children | 46e85199b667 |
| files | etl/src/main/java/org/dive4elements/river/etl/aft/DischargeTable.java etl/src/main/java/org/dive4elements/river/etl/aft/TimeInterval.java |
| diffstat | 2 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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 + "]"; }