[mapserver-commits] r11544 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2011-04-12 05:38:18 -0700 (Tue, 12 Apr 2011)
New Revision: 11544

Modified:
   trunk/mapserver/mapfile.c
   trunk/mapserver/mapgml.c
   trunk/mapserver/mapwcs.c
   trunk/mapserver/mapwfs.c
Log:
DUMP shouldn't be needed in OGC request (#3830)

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-04-12 12:12:42 UTC (rev 11543)
+++ trunk/mapserver/mapfile.c	2011-04-12 12:38:18 UTC (rev 11544)
@@ -3969,7 +3969,6 @@
   writeKeyword(stream, indent, "CONNECTIONTYPE", layer->connectiontype, 9, MS_SDE, "SDE", MS_OGR, "OGR", MS_POSTGIS, "POSTGIS", MS_WMS, "WMS", MS_ORACLESPATIAL, "ORACLESPATIAL", MS_WFS, "WFS", MS_GRATICULE, "GRATICULE", MS_PLUGIN, "PLUGIN", MS_UNION, "UNION");
   writeString(stream, indent, "DATA", NULL, layer->data);
   writeNumber(stream, indent, "DEBUG", 0, layer->debug); /* is this right? see loadLayer() */ 
-  writeKeyword(stream, indent, "DUMP", layer->dump, 1, MS_TRUE, "TRUE");
   writeExtent(stream, indent, "EXTENT", layer->extent);
   writeExpression(stream, indent, "FILTER", &(layer->filter));
   writeString(stream, indent, "FILTERITEM", NULL, layer->filteritem);

Modified: trunk/mapserver/mapgml.c
===================================================================
--- trunk/mapserver/mapgml.c	2011-04-12 12:12:42 UTC (rev 11543)
+++ trunk/mapserver/mapgml.c	2011-04-12 12:38:18 UTC (rev 11544)
@@ -1178,7 +1178,7 @@
     const char *pszOutputSRS = NULL;
     lp = (GET_LAYER(map, map->layerorder[i]));
 
-    if(lp->dump == MS_TRUE && lp->resultcache && lp->resultcache->numresults > 0) { /* found results */
+    if(lp->resultcache && lp->resultcache->numresults > 0) { /* found results */
 
 #ifdef USE_PROJ
       /* Determine output SRS, if map has none, then try using layer's native SRS */
@@ -1410,7 +1410,7 @@
 
     lp = GET_LAYER(map, map->layerorder[i]);
 
-    if(lp->dump == MS_TRUE && lp->resultcache && lp->resultcache->numresults > 0)  { /* found results */
+    if(lp->resultcache && lp->resultcache->numresults > 0)  { /* found results */
       char *layerName;      
       const char *value;
       int featureIdIndex=-1; /* no feature id */

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2011-04-12 12:12:42 UTC (rev 11543)
+++ trunk/mapserver/mapwcs.c	2011-04-12 12:38:18 UTC (rev 11544)
@@ -234,8 +234,8 @@
 
 int msWCSIsLayerSupported(layerObj *layer)
 {
-    /* only raster layers, with 'DUMP TRUE' explicitly defined, are elligible to be served via WCS, WMS rasters are not ok */
-    if(layer->dump && (layer->type == MS_LAYER_RASTER) && layer->connectiontype != MS_WMS) return MS_TRUE;
+    /* only raster layers, are elligible to be served via WCS, WMS rasters are not ok */
+    if((layer->type == MS_LAYER_RASTER) && layer->connectiontype != MS_WMS) return MS_TRUE;
 
     return MS_FALSE;
 }

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2011-04-12 12:12:42 UTC (rev 11543)
+++ trunk/mapserver/mapwfs.c	2011-04-12 12:38:18 UTC (rev 11544)
@@ -471,10 +471,8 @@
 {
     /* In order to be supported, lp->type must be specified, even for 
     ** layers that are OGR, SDE, SDO, etc connections.
-    ** lp->dump must be explicitly set to TRUE in mapfile.
     */
-    if (lp->dump && 
-        (lp->type == MS_LAYER_POINT ||
+    if ((lp->type == MS_LAYER_POINT ||
          lp->type == MS_LAYER_LINE ||
          lp->type == MS_LAYER_POLYGON ) &&
         lp->connectiontype != MS_WMS && 
@@ -833,7 +831,6 @@
       if (!msIntegerInArray(lp->index, ows_request->enabled_layers, ows_request->numlayers))
           continue;
 
-      /* List only vector layers in which DUMP=TRUE */
       if (msWFSIsLayerSupported(lp))
       {
           msWFSDumpLayer(map, lp);
@@ -1946,7 +1943,7 @@
 
       if (!bLayerFound) {
 	/* Requested layer name was not in capabilities:
-	 * either it just doesn't exist, or it's missing DUMP TRUE
+	 * either it just doesn't exist
 	 */
 	msSetError(MS_WFSERR, 
 		   "TYPENAME '%s' doesn't exist in this server.  Please check the capabilities and reformulate your request.",