Merge branch 'branch-6-0'

MapServer · May 30, 2012 · e8724de · e8724de
2 parents fd7af49 + 4538f8e
commit e8724de
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/mapwcs11.c b/mapwcs11.c
@@ -135,6 +135,17 @@ static char *msWCSGetFormatsList11( mapObj *map, layerObj *layer )
         tokens = msStringSplit(value, ' ', &numtokens);
     }
 
+/* -------------------------------------------------------------------- */
+/*      Parse from map.web metadata.                                    */
+/* -------------------------------------------------------------------- */
+
+    else if(layer == NULL
+            && (value = msOWSGetEncodeMetadata( &(map->web.metadata), "CO", "formats",
+                                                NULL)) != NULL )
+    {
+        tokens = msStringSplit(value, ' ', &numtokens);
+    }
+
 /* -------------------------------------------------------------------- */
 /*      Or generate from all configured raster output formats that      */
 /*      look plausible.                                                 */

diff --git a/mapwcs20.c b/mapwcs20.c
@@ -1397,6 +1397,17 @@ static char *msWCSGetFormatsList20( mapObj *map, layerObj *layer )
         tokens = msStringSplit(value, ' ', &numtokens);
     }
 
+    /* -------------------------------------------------------------------- */
+    /*      Parse from map.web metadata.                                    */
+    /* -------------------------------------------------------------------- */
+
+    else if(layer == NULL
+            && (value = msOWSGetEncodeMetadata( &(map->web.metadata), "CO", "formats",
+                                                NULL)) != NULL )
+    {
+        tokens = msStringSplit(value, ' ', &numtokens);
+    }
+
     /* -------------------------------------------------------------------- */
     /*      Or generate from all configured raster output formats that      */
     /*      look plausible.                                                 */
@@ -3180,7 +3191,8 @@ static int msWCSDescribeCoverage20_CoverageDescription(mapObj *map,
         /* -------------------------------------------------------------------- */
         /*      SupportedFormats                                                */
         /* -------------------------------------------------------------------- */
-        {
+        /* for now, WCS 2.0 does not allow per coverage format definitions */
+        /*{
             xmlNodePtr psSupportedFormats;
             char *format_list;
 
@@ -3196,7 +3208,7 @@ static int msWCSDescribeCoverage20_CoverageDescription(mapObj *map,
             }
 
             msFree(format_list);
-        }
+        }*/
 
         /* -------------------------------------------------------------------- */
         /*      nativeFormat                                                    */