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

[svn at osgeo.org]

Author: aboudreault
Date: 2010-08-31 18:31:14 +0000 (Tue, 31 Aug 2010)
New Revision: 10489

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/xmlmapfile/mapfile.xsd
   trunk/mapserver/xmlmapfile/mapfile.xsl
   trunk/mapserver/xmlmapfile/tests/mapfile-test.xml
Log:
Fixed multiple include tags not supported in xml mapfiles (#3530)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-08-31 01:12:33 UTC (rev 10488)
+++ trunk/mapserver/HISTORY.TXT	2010-08-31 18:31:14 UTC (rev 10489)
@@ -13,6 +13,9 @@
 
 Current Version (SVN trunk):
 ----------------------------
+
+- Fixed multiple include tags not supported in xml mapfiles (#3530)
+
 - Support reading .dbf files between 2GB and 4GB (#3514)
 
 - Avoid warnings about ms_cvsid being unused with gcc. 

Modified: trunk/mapserver/xmlmapfile/mapfile.xsd
===================================================================
--- trunk/mapserver/xmlmapfile/mapfile.xsd	2010-08-31 01:12:33 UTC (rev 10488)
+++ trunk/mapserver/xmlmapfile/mapfile.xsd	2010-08-31 18:31:14 UTC (rev 10489)
@@ -742,7 +742,7 @@
 				<xs:element name="fontSet" type="xs:string" minOccurs="0"/>
 				<xs:element name="imageColor" type="ms:rgbColorType" minOccurs="0"/>
 				<xs:element name="imageType" type="xs:string" minOccurs="0"/>
-				<xs:element name="include" type="xs:string" minOccurs="0"/>
+				<xs:element name="include" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
 				<xs:element name="Layer" type="ms:Layer" minOccurs="0" maxOccurs="unbounded"/>
 				<xs:element name="Legend" type="ms:Legend" minOccurs="0"/>
 				<xs:element name="maxSize" type="xs:positiveInteger" minOccurs="0"/>

Modified: trunk/mapserver/xmlmapfile/mapfile.xsl
===================================================================
--- trunk/mapserver/xmlmapfile/mapfile.xsl	2010-08-31 01:12:33 UTC (rev 10488)
+++ trunk/mapserver/xmlmapfile/mapfile.xsl	2010-08-31 18:31:14 UTC (rev 10489)
@@ -1423,13 +1423,16 @@
       <xsl:with-param name="node" select="'ms:imageType'"/>
       <xsl:with-param name="quote" select="1"/>
     </xsl:call-template>
+    <xsl:for-each select="ms:include">
+      <xsl:call-template name="print">
+        <xsl:with-param name="indent" select="$indent"/>
+        <xsl:with-param name="text">
+          <xsl:value-of select="concat('INCLUDE ','&#34;',.,'&#34;')"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      </xsl:for-each>
     <xsl:call-template name="print">
       <xsl:with-param name="indent" select="$indent"/>
-      <xsl:with-param name="node" select="'ms:include'"/>
-      <xsl:with-param name="quote" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="print">
-      <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:maxSize'"/>
     </xsl:call-template>
     <xsl:apply-templates select="ms:projection">

Modified: trunk/mapserver/xmlmapfile/tests/mapfile-test.xml
===================================================================
--- trunk/mapserver/xmlmapfile/tests/mapfile-test.xml	2010-08-31 01:12:33 UTC (rev 10488)
+++ trunk/mapserver/xmlmapfile/tests/mapfile-test.xml	2010-08-31 18:31:14 UTC (rev 10489)
@@ -14,6 +14,7 @@
 	<imageColor red="0" green="255" blue="255"/>
 	<imageType>png</imageType>
         <include>/tmp/myLayerSet.map</include>
+        <include>/tmp/AnotherLayerSet.map</include>
 	<Legend status="ON">
 		<imageColor red="255" green="255" blue="255"/>
 		<keySize x="20" y="10"/>