[mapserver-commits] r10490 - in branches/branch-5-6/mapserver: . xmlmapfile xmlmapfile/tests

[svn at osgeo.org]

Author: aboudreault
Date: 2010-08-31 18:42:01 +0000 (Tue, 31 Aug 2010)
New Revision: 10490

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


Property changes on: branches/branch-5-6/mapserver
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/aboudreault:9103-9193
/trunk/mapserver:9973-9982,10242
   + /sandbox/aboudreault:9103-9193
/trunk/mapserver:9973-9982,10242,10489

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-08-31 18:31:14 UTC (rev 10489)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-08-31 18:42:01 UTC (rev 10490)
@@ -13,6 +13,9 @@
 
 Current Version
 ---------------
+
+- Fixed multiple include tags not supported in xml mapfiles (#3530)
+
 - Ensure the class is not marked BeforeFieldInit causing memory corruption with C#/CLR4 (#3438)
 
 - Fixed MSSQL2008 driver returning invalid extent (#3498)

Modified: branches/branch-5-6/mapserver/xmlmapfile/mapfile.xsd
===================================================================
--- branches/branch-5-6/mapserver/xmlmapfile/mapfile.xsd	2010-08-31 18:31:14 UTC (rev 10489)
+++ branches/branch-5-6/mapserver/xmlmapfile/mapfile.xsd	2010-08-31 18:42:01 UTC (rev 10490)
@@ -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: branches/branch-5-6/mapserver/xmlmapfile/mapfile.xsl
===================================================================
--- branches/branch-5-6/mapserver/xmlmapfile/mapfile.xsl	2010-08-31 18:31:14 UTC (rev 10489)
+++ branches/branch-5-6/mapserver/xmlmapfile/mapfile.xsl	2010-08-31 18:42:01 UTC (rev 10490)
@@ -1422,13 +1422,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: branches/branch-5-6/mapserver/xmlmapfile/tests/mapfile-test.xml
===================================================================
--- branches/branch-5-6/mapserver/xmlmapfile/tests/mapfile-test.xml	2010-08-31 18:31:14 UTC (rev 10489)
+++ branches/branch-5-6/mapserver/xmlmapfile/tests/mapfile-test.xml	2010-08-31 18:42:01 UTC (rev 10490)
@@ -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"/>