# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1317827040 0
# Node ID f4da2009eb8bea668760d4416c5e5875db8f7ce5
# Parent  69929c47164604572e68a2cba18388b5037ae2cf
fixed flys/issue177

flys-artifacts/trunk@2897 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 69929c471646 -r f4da2009eb8b flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Oct 05 14:23:53 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Oct 05 15:04:00 2011 +0000
@@ -1,3 +1,10 @@
+2011-10-05	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	fixed flys/issue177
+
+	* src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java:
+	  Revert rev2245. Code works fine now! :-)
+
 2011-10-05  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Stores a
diff -r 69929c471646 -r f4da2009eb8b flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Wed Oct 05 14:23:53 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Wed Oct 05 15:04:00 2011 +0000
@@ -149,37 +149,37 @@
 
 
     protected String getSeriesName(Gauge gauge) {
-        // XXX The following code stops the artifact server accepting new HTTP
-        // requests. It needs more analysis! Is loading the discharge table a
-        // memory problem? Or is the time interval the problem?
-
-        //List<DischargeTable> dts = gauge.getDischargeTables();
-
-        //for (DischargeTable dt: dts) {
-        //    if (dt.getKind() == 0) {
-        //        TimeInterval ti = dt.getTimeInterval();
-
-        //        Date start = ti.getStartTime();
-        //        Date end   = ti.getStopTime();
-
-        //        String name  = gauge.getName();
+         //XXX The following code stops the artifact server accepting new HTTP
+         //requests. It needs more analysis! Is loading the discharge table a
+         //memory problem? Or is the time interval the problem?
 
-        //        if (end == null) {
-        //            Object[] args = new Object[] { name, start };
-        //            return msg(
-        //                "chart.discharge.curve.curve.valid.from",
-        //                "",
-        //                args);
-        //        }
-        //        else {
-        //            Object[] args = new Object[] { name, start, end };
-        //            return msg(
-        //                "chart.discharge.curve.curve.valid.range",
-        //                "",
-        //                args);
-        //        }
-        //    }
-        //}
+        List<DischargeTable> dts = gauge.getDischargeTables();
+
+        for (DischargeTable dt: dts) {
+            if (dt.getKind() == 0) {
+                TimeInterval ti = dt.getTimeInterval();
+
+                Date start = ti.getStartTime();
+                Date end   = ti.getStopTime();
+
+                String name  = gauge.getName();
+
+                if (end == null) {
+                    Object[] args = new Object[] { name, start };
+                    return msg(
+                        "chart.discharge.curve.curve.valid.from",
+                        "",
+                        args);
+                }
+                else {
+                    Object[] args = new Object[] { name, start, end };
+                    return msg(
+                        "chart.discharge.curve.curve.valid.range",
+                        "",
+                        args);
+                }
+            }
+        }
 
         return gauge.getName();
     }