# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1271064386 0
# Node ID cda3bede32f880595f6c7312e3fba3dc0516574f
# Parent  22c18083225e2ede3828f3320cdf12b93c53f69a
ISSUE215 Switched Values between columns yyyy-mm-dd hh:mm and time_ISO8601

gnv-artifacts/trunk@901 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 22c18083225e -r cda3bede32f8 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Mon Apr 12 06:59:33 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Mon Apr 12 09:26:26 2010 +0000
@@ -1,3 +1,15 @@
+2010-04-12  Tim Englich  <tim.englich@intevation.de>
+
+	  ISSUE 215 msg1189
+
+	* src/main/java/de/intevation/gnv/exports/ODVExport.java (writeData): 
+	  Switched Values between columns yyyy-mm-dd hh:mm and time_ISO8601 and 
+	  manipulate the Values that they are in the correct Format.
+	  This is nessessary because of the definitions of Timeseries in ODV-Exports.
+	* src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java (getStartTime): 
+	  Modified Format of the TimeStamp of the Starttime of TimeSeries in that 
+	  case that it does not contains the values for the seconds.
+
 2010-04-12  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java,
diff -r 22c18083225e -r cda3bede32f8 gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java	Mon Apr 12 06:59:33 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java	Mon Apr 12 09:26:26 2010 +0000
@@ -112,7 +112,9 @@
                 rowList.add(rowArray[i]);
             }
             if (this.startTime != null){
-                rowList.add(this.startTime);
+                String measurementtime = rowList.get(3).replace(' ','T');
+                rowList.set(3, this.startTime.replace('.','-'));
+                rowList.add(measurementtime+":00.0");
             }
             for (int i = 0; i < paramids.size();i++){
                 String key = paramids.get(i);
diff -r 22c18083225e -r cda3bede32f8 gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Mon Apr 12 06:59:33 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Mon Apr 12 09:26:26 2010 +0000
@@ -633,9 +633,9 @@
         if (data != null){
             Object describeData = data.getObject();
             if (describeData instanceof MinMaxDescribeData){
-                return (((MinMaxDescribeData)describeData).
-                        getMinValue()+".0").
-                        replace(' ','T');
+                String value = ((MinMaxDescribeData)describeData)
+                                .getMinValue().toString();
+                return value.substring(0,value.lastIndexOf(':'));
             }
             return null;
         }else{