--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Mon Dec 28 11:50:27 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Mon Dec 28 16:24:05 2009 +0000
@@ -266,7 +266,8 @@
                     chartWidth,
                     chartHeight,
                     linesVisible,
-                    shapesVisible
+                    shapesVisible,
+                    callContext
                 );
             }
             else if (outputMode.equalsIgnoreCase("pdf")) {
@@ -354,13 +355,13 @@
             else if (outputMode.equalsIgnoreCase("csv")) {
                 log.debug("CSV-File will be generated.");
                 Collection<Result> chartResult =
-                    (Collection<Result>) getChartResult(uuid);
+                    (Collection<Result>) getChartResult(uuid, callContext);
                 this.createCSV(outputStream, chartResult);
             } else if (outputMode.equalsIgnoreCase("statistics")) {
                 log.debug("Statistics will be generated.");
                 Statistics s = getStatisticsGenerator();
                 Collection<Result> chartResult =
-                    (Collection<Result>) getChartResult(uuid);
+                    (Collection<Result>) getChartResult(uuid, callContext);
                 Collection<KeyValueDescibeData> parameters = 
                                                 this.getParameters(uuid);
                 Collection<KeyValueDescibeData> measurements = 
@@ -573,7 +574,8 @@
         int          width,
         int          height,
         boolean      linesVisible,
-        boolean      shapesVisible
+        boolean      shapesVisible,
+        CallContext  callContext
     )
     throws IOException, TechnicalChartException
     {
@@ -584,11 +586,12 @@
             parameters,
             measurements,
             dates,
-            getChartResult(uuid),
+            getChartResult(uuid, callContext),
             locale, // Locale
             uuid,
             linesVisible,
-            shapesVisible
+            shapesVisible,
+            callContext
         );
 
         if (chart == null) {
@@ -631,11 +634,12 @@
             parameters,
             measurements,
             dates,
-            (Collection) getChartResult(uuid),
+            (Collection) getChartResult(uuid, context),
             locale,
             uuid,
             linesVisible,
-            shapesVisible
+            shapesVisible,
+            context
         );
 
         if (chart == null) {
@@ -651,6 +655,7 @@
             50F, 50F, 50F, 50F
         );
 
+        /* XXX: @Ingo: What's this? Looks like dev test remains.
         try {
             OutputStream toFile = new FileOutputStream("/vol1/home/iweinzierl/tmp/test.svg");
             ChartExportHelper.exportSVG(
@@ -663,6 +668,7 @@
             toFile.close();
         }
         catch(Exception e) { log.debug("ERROR WHLILE TEST."); }
+        */
     }
 
 
@@ -686,11 +692,12 @@
             parameters,
             measurements,
             dates,
-            (Collection) getChartResult(uuid),
+            (Collection) getChartResult(uuid, callContext),
             locale,
             uuid,
             linesVisible,
-            shapesVisible
+            shapesVisible,
+            callContext
         );
 
         if (chart == null) {
@@ -719,13 +726,14 @@
         Locale       locale,
         String       uuid,
         boolean      linesVisible,
-        boolean      shapesVisible
+        boolean      shapesVisible,
+        CallContext  callContext
     ) {
         Chart chart = null;
 
         if (CACHE_CHART) {
             log.info("Try to get timeseries chart from cache.");
-            chart = (Chart) getChartFromCache(uuid);
+            chart = (Chart) getChartFromCache(uuid, callContext);
         }
 
         if (chart != null)