[mapserver-commits] r9283 - branches/branch-5-4/mapserver trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-08-31 13:13:45 -0400 (Mon, 31 Aug 2009)
New Revision: 9283

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/mapcontext.c
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapcontext.c
Log:
Fix WMC XML output when Dimension is used (#3110)



Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-08-31 14:14:00 UTC (rev 9282)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-08-31 17:13:45 UTC (rev 9283)
@@ -14,6 +14,8 @@
 Current Version:
 ----------------
 
+- Fix WMC XML output when Dimension is used (#3110)
+
 - Fix output for valid WCS 1.1 XML (#3086)
 
 - Avoid double free with postgresql joins. (#2936)

Modified: branches/branch-5-4/mapserver/mapcontext.c
===================================================================
--- branches/branch-5-4/mapserver/mapcontext.c	2009-08-31 14:14:00 UTC (rev 9282)
+++ branches/branch-5-4/mapserver/mapcontext.c	2009-08-31 17:13:45 UTC (rev 9283)
@@ -2157,7 +2157,10 @@
           }
 
           if(bDimensionList)
+          {
               msIO_fprintf( stream, "      </DimensionList>\n");
+              bDimensionList = 0;
+          }
 
           msIO_fprintf(stream, "    </Layer>\n");
       }

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-08-31 14:14:00 UTC (rev 9282)
+++ trunk/mapserver/HISTORY.TXT	2009-08-31 17:13:45 UTC (rev 9283)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fix WMC XML output when Dimension is used (#3110)
+
 - Enable LOAD_WHOLE_IMAGE processing option by default when rendering
   WMS client layer images (#3111). 
 

Modified: trunk/mapserver/mapcontext.c
===================================================================
--- trunk/mapserver/mapcontext.c	2009-08-31 14:14:00 UTC (rev 9282)
+++ trunk/mapserver/mapcontext.c	2009-08-31 17:13:45 UTC (rev 9283)
@@ -2157,7 +2157,10 @@
           }
 
           if(bDimensionList)
+          {
               msIO_fprintf( stream, "      </DimensionList>\n");
+              bDimensionList = 0;
+          }
 
           msIO_fprintf(stream, "    </Layer>\n");
       }