--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Mon Mar 22 12:54:04 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Tue Mar 23 14:09:03 2010 +0000
@@ -37,6 +37,8 @@
 import de.intevation.gnv.exports.DefaultDataCollector;
 import de.intevation.gnv.exports.DefaultExport;
 import de.intevation.gnv.exports.DefaultProfile;
+import de.intevation.gnv.exports.Export;
+import de.intevation.gnv.exports.ODVExport;
 import de.intevation.gnv.exports.SimpleOdvDataCollector;
 import de.intevation.gnv.exports.Export.Profile;
 import de.intevation.gnv.geobackend.base.Result;
@@ -122,12 +124,11 @@
           "CRUISE",
           "STATION",
           "TYPE",
+          "TIMEVALUE",
           "SHAPE",
           "BOTDEPTH",
           "DEPTH",
-          "TIMEVALUE",
-          "DATAVALUE",
-          "PARAMETER"
+          "QF"
     };
 
 
@@ -135,13 +136,12 @@
         "Cruise",
         "Station",
         "Type",
-        "Longitude [deegrees_east]",
-        "Latitude [deegrees_north]",
+        "yyyy-mm-dd hh:mm",
+        "Lon (°E)",
+        "Lat (°N)",
         "Bot. Depth [m]",
         "Depth [m]",
-        "Date/Time",
-        "Value",
-        "Parameterid"
+        "QF"
     };
 
     /**
@@ -401,7 +401,7 @@
             }
             else if (outputMode.equalsIgnoreCase("odv")) {
                 Collection<Result> odvResult = this.getODVResult(uuid);
-                this.createODV(outputStream, odvResult);
+                this.createODV(outputStream, odvResult,uuid);
             }
         } catch (IOException e) {
             log.error(e, e);
@@ -488,11 +488,14 @@
     /**
      * TODO Result is not used at the moment. Change result with correct data.
      */
-    protected void createODV(OutputStream outputStream, Collection result)
+    protected void createODV(OutputStream outputStream, 
+                             Collection result,
+                             String uuid)
     throws IOException, StateException {
 
-        DefaultExport export = new DefaultExport(new SimpleOdvDataCollector(
-            TIMESERIES_ODV_PROFILE_NAMES));
+        Export export = new ODVExport(new SimpleOdvDataCollector(
+            TIMESERIES_ODV_PROFILE_NAMES),
+            this.getParameters(uuid));
 
         if (result == null)
             log.error("#################### RESULT == NULL #################");