changeset 743:e95e6df97e55

#177 Commented out the code that generates the series names in discharge curves. This code currently generates memory problems and stops the server accepting new http requests. flys-artifacts/trunk@2245 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 27 Jun 2011 07:45:32 +0000
parents c09c9e05ecfa
children b385577bcaca
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java
diffstat 2 files changed, 39 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Sun Jun 26 17:18:59 2011 +0000
+++ b/flys-artifacts/ChangeLog	Mon Jun 27 07:45:32 2011 +0000
@@ -1,3 +1,12 @@
+2011-06-27  Ingo Weinzierl <ingo@intevation.de>
+
+	  flys/issue177 (WINFO: Abflusskurven am Pegel verursachen ein Hängen des Servers)
+
+	* src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java:
+	  Commented out code to generate time ranges for series names. There
+	  seems to be a problem while loading the discharge tables of a gauge or
+	  while determining the start and/or end time of such discharge tables.
+
 2011-06-26  Sascha L. Teichmann <sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/**/*.java: Removed trailing whitespace.
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Sun Jun 26 17:18:59 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Mon Jun 27 07:45:32 2011 +0000
@@ -150,33 +150,37 @@
 
 
     protected String getSeriesName(Gauge gauge) {
-        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();
     }

http://dive4elements.wald.intevation.org