Mercurial > dive4elements > gnv-client
changeset 816:cda3bede32f8
ISSUE215 Switched Values between columns yyyy-mm-dd hh:mm and time_ISO8601
gnv-artifacts/trunk@901 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Mon, 12 Apr 2010 09:26:26 +0000 |
| parents | 22c18083225e |
| children | 3f447e92024a |
| files | gnv-artifacts/ChangeLog gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java |
| diffstat | 3 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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,
--- 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);
--- 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{