# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1305899339 -7200
# Node ID ef1ee8e752b2984299eb96f7921e176da95ab35c
# Parent  4e0464c620f01783dcb9bd48ec391f1dae227a0b
Write the symbols-file to the mapfile path.

diff -r 4e0464c620f0 -r ef1ee8e752b2 ChangeLog
--- a/ChangeLog	Fri May 20 15:34:35 2011 +0200
+++ b/ChangeLog	Fri May 20 15:48:59 2011 +0200
@@ -1,3 +1,8 @@
+2011-05-20  Raimund Renkert  <raimund.renkert@intevation.de>
+
+	* src/java/de/intevation/mxd/writer/MapScriptWriter.java:
+	  Write the symbols-file to the mapfile path.
+
 2011-05-20  Raimund Renkert  <raimund.renkert@intevation.de>
 
 	* src/java/de/intevation/mxd/reader/FeatureLayerReader.java:
diff -r 4e0464c620f0 -r ef1ee8e752b2 src/java/de/intevation/mxd/writer/MapScriptWriter.java
--- a/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Fri May 20 15:34:35 2011 +0200
+++ b/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Fri May 20 15:48:59 2011 +0200
@@ -320,6 +320,7 @@
      * @param symbolElement The DOM object containing the attributes.
      */
     private void writeCharSymbol(symbolObj symbol, Element symbolElement) {
+        //TODO Write the symbol correctly. See Issue 3885 on trac.osgeo.org
         symbol.setFont(symbolElement.getAttribute("font"));
         symbol.setType(MS_SYMBOL_TYPE.MS_SYMBOL_TRUETYPE.swigValue());
         symbol.setAntialias(1);
@@ -336,13 +337,13 @@
             root,
             "/mxd/file",
             XPathConstants.NODE);
-        String filename = fileNode.getAttribute("name");
+        String mapFilename = fileNode.getAttribute("name");
         String path = "";
-        if(filename.contains("/")) {
-            path = filename.substring(0, filename.lastIndexOf("/"));
+        if(mapFilename.contains("/")) {
+            path = mapFilename.substring(0, mapFilename.lastIndexOf("/"));
         }
-        else if(filename.contains("\\")) {
-            path = filename.substring(0, filename.lastIndexOf("\\"));
+        else if(mapFilename.contains("\\")) {
+            path = mapFilename.substring(0, mapFilename.lastIndexOf("\\"));
         }
         symbols.save(path + "/symbols.sym");
     }