Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java @ 233:2ceb4bf51cba
Added DataCollector which collects data used for exports.
gnv-artifacts/trunk@301 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Mon, 09 Nov 2009 09:43:52 +0000 |
| parents | 3d6d89bcbf42 |
| children | a157c6042cb4 |
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java Mon Nov 09 08:55:01 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java Mon Nov 09 09:43:52 2009 +0000 @@ -52,6 +52,10 @@ import de.intevation.gnv.transition.describedata.KeyValueDescibeData; import de.intevation.gnv.transition.describedata.NamedCollection; import de.intevation.gnv.transition.exception.TransitionException; +import de.intevation.gnv.exports.DefaultExport; +import de.intevation.gnv.exports.DefaultDataCollector; +import de.intevation.gnv.exports.DefaultProfile; +import de.intevation.gnv.exports.Export.Profile; import de.intevation.gnv.utils.ArtifactXMLUtilities; @@ -108,7 +112,6 @@ */ public static final Profile TIMESERIES_CSV_PROFILE = new DefaultProfile( - TIMESERIES_CSV_PROFILE_NAMES, ',', '"', '"', @@ -121,7 +124,6 @@ */ public static final Profile TIMESERIES_ODV_PROFILE = new DefaultProfile( - TIMESERIES_ODV_PROFILE_NAMES, '\t', CSVWriter.NO_QUOTE_CHARACTER, CSVWriter.NO_ESCAPE_CHARACTER, @@ -190,8 +192,6 @@ Document doc = this.writeStatistics2XML(statistics); this.writeDocument2OutputStream(doc, outputStream); } else if (outputMode.equalsIgnoreCase("odv")) { - //TimeSeriesExport export = new TimeSeriesExport(); - //export.createODV(outputStream, chartResult); Collection<Result> odvResult = this.getODVResult(uuid); this.createODV(outputStream, odvResult); @@ -221,7 +221,8 @@ throws UnsupportedEncodingException, IOException, TransitionException { - DefaultExport export = new DefaultExport(); + DefaultExport export = new DefaultExport(new DefaultDataCollector( + TIMESERIES_CSV_PROFILE_NAMES)); export.create(TIMESERIES_CSV_PROFILE, outputStream, chartResult); } @@ -232,7 +233,8 @@ protected void createODV(OutputStream outputStream, Collection result) throws IOException, TransitionException { - DefaultExport export = new DefaultExport(); + DefaultExport export = new DefaultExport(new DefaultDataCollector( + TIMESERIES_CSV_PROFILE_NAMES)); export.create(TIMESERIES_ODV_PROFILE, outputStream, result); }