comparison gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java @ 467:b2d2b36b20a0

Use XMLUtils to evaluate xpath expressions instead of using Config class. Adapted xpath (namespace and prefix). gnv-artifacts/trunk@530 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 12 Jan 2010 08:49:51 +0000
parents 04cfb4e3da4f
children 211cad2fb5ba
comparison
equal deleted inserted replaced
466:147d1e46b239 467:b2d2b36b20a0
32 import org.jfree.chart.ChartTheme; 32 import org.jfree.chart.ChartTheme;
33 33
34 import au.com.bytecode.opencsv.CSVWriter; 34 import au.com.bytecode.opencsv.CSVWriter;
35 import de.intevation.artifactdatabase.Config; 35 import de.intevation.artifactdatabase.Config;
36 import de.intevation.artifactdatabase.XMLUtils; 36 import de.intevation.artifactdatabase.XMLUtils;
37 import de.intevation.artifacts.ArtifactNamespaceContext;
37 import de.intevation.artifacts.CallMeta; 38 import de.intevation.artifacts.CallMeta;
38 import de.intevation.artifacts.CallContext; 39 import de.intevation.artifacts.CallContext;
39 import de.intevation.artifacts.PreferredLocale; 40 import de.intevation.artifacts.PreferredLocale;
40 import de.intevation.gnv.artifacts.context.GNVArtifactContext; 41 import de.intevation.gnv.artifacts.context.GNVArtifactContext;
41 import de.intevation.gnv.artifacts.ressource.RessourceFactory; 42 import de.intevation.gnv.artifacts.ressource.RessourceFactory;
70 * @author Tim Englich <tim.englich@intevation.de> 71 * @author Tim Englich <tim.englich@intevation.de>
71 * 72 *
72 */ 73 */
73 public class TimeSeriesOutputState extends OutputStateBase { 74 public class TimeSeriesOutputState extends OutputStateBase {
74 75
76 public static final String XPATH_OUTPUT_MODE =
77 "/art:action/art:out/@name";
78
79 public static final String XPATH_MIME_TYPE =
80 "/art:action/art:out/art:mime-type/@value";
81
75 protected static final boolean CACHE_CHART = 82 protected static final boolean CACHE_CHART =
76 Boolean.parseBoolean(System.getProperty("cache.chart", "false")); 83 Boolean.parseBoolean(System.getProperty("cache.chart", "false"));
77 84
78 protected static final boolean PDF_FORMAT_LANDSCAPE = 85 protected static final boolean PDF_FORMAT_LANDSCAPE =
79 Boolean.parseBoolean(System.getProperty("export.pdf.landscape","true")); 86 Boolean.parseBoolean(System.getProperty("export.pdf.landscape","true"));
186 CallContext callContext 193 CallContext callContext
187 ) throws StateException 194 ) throws StateException
188 { 195 {
189 log.debug("TimeSeriesOutputTransition.out"); 196 log.debug("TimeSeriesOutputTransition.out");
190 197
191 String outputMode = Config.getStringXPath( 198 String outputMode = XMLUtils.xpathString(
192 format, 199 format, XPATH_OUTPUT_MODE, ArtifactNamespaceContext.INSTANCE);
193 "action/out/@name" 200
194 ); 201 String mimeType = XMLUtils.xpathString(
195 String mimeType = Config.getStringXPath( 202 format, XPATH_MIME_TYPE, ArtifactNamespaceContext.INSTANCE);
196 format,
197 "action/out/mime-type/@value"
198 );
199 203
200 CallMeta callMeta = callContext.getMeta(); 204 CallMeta callMeta = callContext.getMeta();
201 205
202 try { 206 try {
203 if (outputMode.equalsIgnoreCase("chart")) { 207 if (outputMode.equalsIgnoreCase("chart")) {

http://dive4elements.wald.intevation.org