[mapserver-commits] r11532 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-04-11 13:19:32 -0700 (Mon, 11 Apr 2011)
New Revision: 11532

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapows.c
   trunk/mapserver/mapwms.c
Log:
wms_getmap_formatlist causes first defined outputformat to be returned by getmap (#3826)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-11 19:03:34 UTC (rev 11531)
+++ trunk/mapserver/HISTORY.TXT	2011-04-11 20:19:32 UTC (rev 11532)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- wms_getmap_formatlist causes first defined outputformat to be returned by getmap (#3826)
+
 - fix building of mapcluster.c when OGR support is disabled
 
 - fix some valgrind found memory leaks (offset symbols, and gd io contexts)

Modified: trunk/mapserver/mapows.c
===================================================================
--- trunk/mapserver/mapows.c	2011-04-11 19:03:34 UTC (rev 11531)
+++ trunk/mapserver/mapows.c	2011-04-11 20:19:32 UTC (rev 11532)
@@ -2202,6 +2202,7 @@
     
     if (map && format && metadata && namespaces && name)
     {
+        msApplyDefaultOutputFormats(map);
         format_list = msOWSLookupMetadata(metadata, namespaces, name);
         n = 0;
         if ( format_list)

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2011-04-11 19:03:34 UTC (rev 11531)
+++ trunk/mapserver/mapwms.c	2011-04-11 20:19:32 UTC (rev 11532)
@@ -671,7 +671,6 @@
     }
     else if (strcasecmp(names[i], "FORMAT") == 0) {
       const char *format_list = NULL;
-      outputFormatObj *psFormat=NULL;
       formatfound = 1;
 
       if (strcasecmp(values[i], "application/openlayers")!=0)
@@ -680,9 +679,9 @@
           format_list = msOWSLookupMetadata(&(map->web.metadata), "M","getmap_formatlist");
           if (format_list)
           {
-              psFormat = msOwsIsOutputFormatValid(map, values[i], &(map->web.metadata),
-                                                  "M", "getmap_formatlist");
-              if (psFormat == NULL &&
+              format = msOwsIsOutputFormatValid(map, values[i], &(map->web.metadata),
+                                                "M", "getmap_formatlist");
+              if (format == NULL &&
                   strcasecmp(values[i], "application/openlayers")!=0)
               {
                   msSetError(MS_IMGERR,