diff gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesVectorOutputState.java @ 1071:9bb1979aabbe

Added a new output state and chart type for vertical profiles using vector data. gnv-artifacts/trunk@1168 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 07 Jun 2010 15:00:23 +0000
parents cc4ec127d666
children 1728aac87717
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesVectorOutputState.java	Mon Jun 07 14:42:42 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesVectorOutputState.java	Mon Jun 07 15:00:23 2010 +0000
@@ -42,6 +42,10 @@
     private static Logger logger =
         Logger.getLogger(TimeSeriesVectorOutputState.class);
 
+    public static final String[] RESULT_COLUMNS = {
+       "YORDINATE", "XORDINATE", "GROUP1", "GROUP2", "GROUP3", "GAPID", "SERIES"
+    };
+
     public static final String[] ODV_COLUMN_HEADERS = {
         "Cruise",
         "Station",
@@ -107,7 +111,7 @@
             else {
                 logger.debug("Element not in cache, we ask the database");
                 Collection<Result> res = (Collection<Result>)getData(queryID);
-                res                    = VectorDataProcessor.process(res);
+                res = VectorDataProcessor.process(res, RESULT_COLUMNS);
                 cache.put(new net.sf.ehcache.Element(key, res));
 
                 return res;
@@ -117,7 +121,8 @@
             // we don't use a cache, so we have to query the database every
             // single time
             logger.info("Not using a cache.");
-            return VectorDataProcessor.process(getData(queryID));
+            return VectorDataProcessor.process(
+                getData(queryID), RESULT_COLUMNS);
         }
     }
 

http://dive4elements.wald.intevation.org