Mercurial > dive4elements > river
changeset 1642:6c0b79efd2c9
Bugfix: #320 Substitue '../' in shapefile directories.
flys-artifacts/trunk@2829 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 27 Sep 2011 07:41:21 +0000 |
| parents | eb3ab28d1c21 |
| children | ff7bffb7d5f0 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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();