# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1317109281 0
# Node ID 6c0b79efd2c90ee1e5314d8c3d599f42a37366ea
# Parent  eb3ab28d1c210af5fa10fd5362e044a762c01765
Bugfix: #320 Substitue '../' in shapefile directories.

flys-artifacts/trunk@2829 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r eb3ab28d1c21 -r 6c0b79efd2c9 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Sep 26 15:35:46 2011 +0000
+++ b/flys-artifacts/ChangeLog	Tue Sep 27 07:41:21 2011 +0000
@@ -1,3 +1,10 @@
+2011-09-27  Ingo Weinzierl <ingo@intevation.de>
+
+	flys/issue320 (ÜSK:Mapserver hat Probleme beim Shapefilepath mit "../" im Pfad)
+
+	* src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Use
+	  File.getCanonicalPath() to substitute "../" in shapefile directories.
+
 2011-09-26  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java:
diff -r eb3ab28d1c21 -r 6c0b79efd2c9 flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Mon Sep 26 15:35:46 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Tue Sep 27 07:41:21 2011 +0000
@@ -394,7 +394,7 @@
             context.put("MAPSERVERURL",
                 FLYSUtils.getXPathString(FLYSUtils.XPATH_MAPSERVER_URL));
             context.put("SHAPEFILEPATH",
-                FLYSUtils.getXPathString(FLYSUtils.XPATH_SHAPEFILE_DIR));
+                getShapefileBaseDir().getCanonicalPath());
             context.put("LAYERS", fillLayerTemplates(layers));
 
             Template mapTemplate = getMapfileTemplate();