[mapserver-commits] r10803 - in trunk/mapserver: . xmlmapfile xmlmapfile/tests

[svn at osgeo.org]

Author: aboudreault
Date: 2010-12-17 07:22:44 -0800 (Fri, 17 Dec 2010)
New Revision: 10803

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/xmlmapfile/mapfile.xsl
   trunk/mapserver/xmlmapfile/tests/layerset.xml
Log:
Fixed Transformation from XML to MapFile only handles one PROCESSING element (#3631)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-12-16 22:16:46 UTC (rev 10802)
+++ trunk/mapserver/HISTORY.TXT	2010-12-17 15:22:44 UTC (rev 10803)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed Transformation from XML to MapFile only handles one PROCESSING element (#3631)
+
 - Fixed 16bit classification support - problem introduced with new 
   renderer architecture (#3624) 
 

Modified: trunk/mapserver/xmlmapfile/mapfile.xsl
===================================================================
--- trunk/mapserver/xmlmapfile/mapfile.xsl	2010-12-16 22:16:46 UTC (rev 10802)
+++ trunk/mapserver/xmlmapfile/mapfile.xsl	2010-12-17 15:22:44 UTC (rev 10803)
@@ -1283,11 +1283,14 @@
       <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:postLabelCache'"/>
     </xsl:call-template>
-    <xsl:call-template name="print">
-      <xsl:with-param name="indent" select="$indent"/>
-      <xsl:with-param name="node" select="'ms:processing'"/>
-      <xsl:with-param name="quote" select="1"/>
-    </xsl:call-template>
+    <xsl:for-each select="ms:processing">
+      <xsl:call-template name="print">
+        <xsl:with-param name="indent" select="$indent"/>
+        <xsl:with-param name="text">
+          <xsl:value-of select="concat('PROCESSING ','&#34;',.,'&#34;')"/>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:for-each>
     <xsl:apply-templates select="ms:projection">
       <xsl:with-param name="indent" select="$indent + 1"/>
     </xsl:apply-templates>

Modified: trunk/mapserver/xmlmapfile/tests/layerset.xml
===================================================================
--- trunk/mapserver/xmlmapfile/tests/layerset.xml	2010-12-16 22:16:46 UTC (rev 10802)
+++ trunk/mapserver/xmlmapfile/tests/layerset.xml	2010-12-17 15:22:44 UTC (rev 10803)
@@ -114,7 +114,7 @@
     <plugin>myPlugin.lib</plugin>
     <postLabelCache>TRUE</postLabelCache>
     <processing>CLOSE_CONNECTION=DEFER</processing>
-    <processing>CLOSE_CONNECTION=DEFER</processing>
+    <processing>SCALE=AUTO</processing>
     <projection>init=epsg:4326 ellps=WGS84 datum=WGS84</projection>
     <requires>[orthoquads]</requires>
     <sizeUnits>METERS</sizeUnits>