[mapserver-commits] r11293 - trunk/mapserver

[svn at osgeo.org]

Author: schpidi
Date: 2011-03-21 05:03:08 -0700 (Mon, 21 Mar 2011)
New Revision: 11293

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwcs20.c
Log:
Initialize default formats in WCS 2.0.


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-20 20:48:01 UTC (rev 11292)
+++ trunk/mapserver/HISTORY.TXT	2011-03-21 12:03:08 UTC (rev 11293)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Initialize default formats in WCS.
+
 - Fix csharp Makefile.in (#3758)
 
 - Allow run-time subs in class->text (makes sense if you allow it in class->expression).

Modified: trunk/mapserver/mapwcs20.c
===================================================================
--- trunk/mapserver/mapwcs20.c	2011-03-20 20:48:01 UTC (rev 11292)
+++ trunk/mapserver/mapwcs20.c	2011-03-21 12:03:08 UTC (rev 11293)
@@ -2419,10 +2419,8 @@
         driver_short_name = GDALGetDriverShortName(hDriver);
         driver_long_name = GDALGetDriverLongName(hDriver);
         /* TODO: improve this, exchange strstr() */
-        msDebug("msWCSGetCoverageMetadata20(): Driver long name = '%s' and short name = '%s'.\n", driver_long_name, driver_short_name);
         for(i = 0; i < layer->map->numoutputformats; ++i)
         {
-            msDebug("msWCSGetCoverageMetadata20(): processing outputformat %s.\n", layer->map->outputformatlist[i]->driver);
             if(strstr( layer->map->outputformatlist[i]->driver, driver_short_name) != NULL
                || strstr(layer->map->outputformatlist[i]->driver, driver_long_name) != NULL)
             {
@@ -3545,10 +3543,12 @@
     //msWCSSetDefaultBandsRangeSetInfo(params, &cm, layer);
     //msDebug("Bandcount: %d\n", cm.bandcount);
 
+    msApplyDefaultOutputFormats(map);
+
     if (msGetOutputFormatIndex(map, params->format) == -1)
     {
-        msSetError(MS_WCSERR, "Unrecognized value for the FORMAT parameter.",
-                "msWCSGetCoverage20()");
+        msSetError(MS_WCSERR, "Unrecognized value '%s' for the FORMAT parameter.",
+                "msWCSGetCoverage20()", params->format);
         return msWCSException(map, "InvalidParameterValue", "format",
                 params->version);
     }