dive4elements/gnv-client: gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java comparison

comparison gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java @ 828:28028979c813

Integrated the possibility to change the Title of an Layer in Product Layer. gnv-artifacts/trunk@922 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Tim Englich <tim.englich@intevation.de>
date	Tue, 13 Apr 2010 14:22:52 +0000
parents	ac1b9f00603f
children	2423cefe7d39

comparison

equal deleted inserted replaced

-:fe0263926870
+:28028979c813
 import de.intevation.gnv.geobackend.base.query.exception.QueryException;
 import de.intevation.gnv.state.InputData;
 import de.intevation.gnv.state.OutputStateBase;
 import de.intevation.gnv.state.exception.StateException;
 import de.intevation.gnv.utils.ArtifactXMLUtilities;
+import de.intevation.gnv.utils.ExclusiveExec;
 import de.intevation.gnv.utils.FileUtils;
 import de.intevation.gnv.utils.MapfileGenerator;
 import de.intevation.gnv.utils.MetaWriter;
 import de.intevation.gnv.utils.ShapeFileWriter;
 format, XPATH_OUTPUT_MODE, ArtifactNamespaceContext.INSTANCE);
 if (outputMode.equalsIgnoreCase("wms")) {
 Collection<Result> data = this.fetchData();
 if (data != null && !data.isEmpty()){
 XMLUtils.toStream(this.getWMS(uuid, callContext,
-data, geometryType),
+data, geometryType,
+inputData),
 outputStream);
 }else{
 this.writeExceptionReport2Stream(outputStream);
 }
 }else if (outputMode.equalsIgnoreCase("zip")){
 boolean success    = false;
 boolean createdDir = false;
 try {
 synchronized (shapeFileLock) {
-int count = 0;
+if (shapeDir.exists()) {
-while (shapeDir.exists()) {
+FileUtils.deleteContent(shapeDir);
-shapeDir = new File(baseDir, uuid + "-" + count);
+}
-++count;
+else if (!shapeDir.mkdirs()) {
-}
-if (!shapeDir.mkdirs()) {
 log.error("cannot create directory '"
 + shapeDir.getAbsolutePath() + "'");
 return null;
 }
 createdDir = true;
 *
 * @param uuid The UUID of the current artifact.
 * @param callContext The CallContext object.
 * @param data A collection with some input data.
 * @param geometryType The geometry type.
+* @param inputData the Parameters which are send by the out-Call.
 * @return a document with some meta information (shapefile path, geometry
 * type, time to live of the current artifact, etc).
 * @throws StateException if an error occured while shapefile writing.
 */
 protected Document getWMS(String uuid,
 CallContext callContext,
 Collection<Result> data,
-String geometryType)
+String geometryType,
+Collection<InputData> inputData)
 throws StateException
 {
 Document document = XMLUtils.newDocument();
 Element pathElement = document.createElement("path");
 document.appendChild(pathElement);
 String path = getShapeFilePath();
 if (path != null && new File(path).isDirectory()) {
+String title = getLayerTitle(inputData);
+if (title == null) {
+title = uuid;
+}
+callContext.putContextValue(
+MetaWriter.CONTEXT_LAYER_TITLE, title);
+String paramType = findParameterTitle(geometryType);
+if (log.isDebugEnabled()) {
+log.debug("Layer title: " + title);
+log.debug("Layer type: " + paramType);
+}
+Document meta = MetaWriter.writeHorizontalcrosssectionMeta(
+callContext, uuid, path, paramType);
+if (meta != null) {
+MapfileGenerator.getInstance().update();
+return meta;
+}
 pathElement.setTextContent(path);
 }
 else {
+ExclusiveExec.UniqueKey key = ExclusiveExec.INSTANCE.acquire(uuid);
-if (data != null &&
+try{
-(path = writeToShapeFile(uuid, data, callContext,geometryType)) != null) {
+if (data != null &&
+(path = writeToShapeFile(uuid, data, callContext,geometryType)) != null) {
-String paramType = LAYER_MODEL+"_"+templateID;
+String paramType = findParameterTitle(geometryType);
+String    title      = getLayerTitle(inputData);
-if (!MapfileGenerator.getInstance().templateExists(paramType)){
+if (title == null) {
-// If the template doesn't exist the Defaulttemplates will be used.
+title = uuid;
-paramType = LAYER_MODEL+"_"+
+}
-this.determineDefaultTemplateName(geometryType);
+Document meta = MetaWriter.writeLayerMeta(callContext, uuid,
-}
+path, paramType,
-Document meta = MetaWriter.writeLayerMeta(callContext, uuid,
+this.determineGeometryType(geometryType));
-path, paramType,
+if (meta != null) {
-this.determineGeometryType(geometryType));
+MapfileGenerator.getInstance().update();
-if (meta != null) {
+return meta;
-MapfileGenerator.getInstance().update();
+}
-return meta;
+pathElement.setTextContent(path);
 }
+}finally{
-pathElement.setTextContent(path);
+ExclusiveExec.INSTANCE.release(key);
 }
 }
 return document;
+}
+/**
+* Returns the parameterType for the Layer.
+* @param geometryType
+* @return
+*/
+private String findParameterTitle(String geometryType) {
+String paramType = LAYER_MODEL+"_"+templateID;
+if (!MapfileGenerator.getInstance().templateExists(paramType)){
+// If the template doesn't exist the Defaulttemplates will be used.
+paramType = LAYER_MODEL+"_"+
+this.determineDefaultTemplateName(geometryType);
+}
+return paramType;
+}
+/**
+* Find the title for a wms layer specified by the user.
+*
+* @param inputData A collection with InputData objects.
+* @return the title.
+*/
+protected String getLayerTitle(Collection<InputData> inputData) {
+for (InputData data: inputData) {
+String name = data.getName();
+if (name != null && name.equals("title")) {
+return (String) data.getValue();
+}
+}
+return null;
 }
 /**
 * Turns the geometry type into a form used for the templating mechanism

Mercurial > dive4elements > gnv-client

comparison gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java @ 828:28028979c813