changeset 1130:e6dd52342eb7

Trigger the mapfile creation after WSPLGEN jobs have finished. flys-artifacts/trunk@2645 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 05 Sep 2011 15:29:11 +0000 (2011-09-05)
parents da3c3e286c88
children effe8f945c93
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/mapserver/layer.vm flys-artifacts/doc/conf/mapserver/mapfile.vm flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java
diffstat 4 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Mon Sep 05 14:04:03 2011 +0000
+++ b/flys-artifacts/ChangeLog	Mon Sep 05 15:29:11 2011 +0000
@@ -1,3 +1,12 @@
+2011-09-05  Ingo Weinzierl <ingo@intevation.de>
+
+	* doc/conf/mapserver/layer.vm,
+	  doc/conf/mapserver/mapfile.vm: Small bugfixes and style improvements.
+
+	* src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Trigger the
+	  MapfileGenerator after a WSPLGEN job has finished regardless if it has
+	  been finished successfully or not.
+
 2011-09-05  Ingo Weinzierl <ingo@intevation.de>
 
 	* pom.xml: Added Apache Velocity 1.7 for templating support.
--- a/flys-artifacts/doc/conf/mapserver/layer.vm	Mon Sep 05 14:04:03 2011 +0000
+++ b/flys-artifacts/doc/conf/mapserver/layer.vm	Mon Sep 05 15:29:11 2011 +0000
@@ -1,6 +1,6 @@
 LAYER
     NAME      "$LAYER.getIdentifier()"
-    TYPE      "$LAYER.getType()"
+    TYPE      $LAYER.getType()
     DATA      "$LAYER.getIdentifier()/$LAYER.getData()"
     STATUS    ON
     TEMPLATE  map.html
@@ -15,9 +15,8 @@
     CLASS
         NAME "Layer"
         STYLE
-            SYMBOl 'point'
             SIZE 5
-            COLOR "#FFFF00"
+            COLOR "#66CCFF"
         END
     END
 END
--- a/flys-artifacts/doc/conf/mapserver/mapfile.vm	Mon Sep 05 14:04:03 2011 +0000
+++ b/flys-artifacts/doc/conf/mapserver/mapfile.vm	Mon Sep 05 15:29:11 2011 +0000
@@ -3,7 +3,7 @@
     STATUS ON
     SIZE 600 400
     MAXSIZE 4000
-    EXTENT -1 53 11 58
+    EXTENT -90 -180 90 180
     UNITS DD
     SHAPEPATH $SHAPEFILEPATH
     FONTSET "fontset.txt"
@@ -30,6 +30,7 @@
         "wms_contactvoicetelephone" "Any's telephone number"
         "wms_srs" "EPSG:4326 EPSG:31466 EPSG:31467"
         "wms_feature_info_mime_type" "text/html"
+        "ows_enable_request"   "*"
       END
     END
 
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java	Mon Sep 05 14:04:03 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java	Mon Sep 05 15:29:11 2011 +0000
@@ -10,6 +10,8 @@
 
 import de.intevation.flys.artifacts.model.WSPLGENJob;
 
+import de.intevation.flys.utils.MapfileGenerator;
+
 
 public class JobExecutor {
 
@@ -78,6 +80,8 @@
 
                 logger.info("WSPLGEN exit value: " + process.exitValue());
 
+                MapfileGenerator.getInstance().update();
+
                 return;
             }
         }

http://dive4elements.wald.intevation.org