[mapserver-commits] r8575 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-02-18 10:18:37 -0500 (Wed, 18 Feb 2009)
New Revision: 8575

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcsos.c
   trunk/mapserver/mapwcs.c
   trunk/mapserver/mapwfs.c
   trunk/mapserver/mapwms.c
Log:
OWS GetCapabilities should skip layers with status == MS_DELETE (#2582)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-02-18 10:09:17 UTC (rev 8574)
+++ trunk/mapserver/HISTORY.TXT	2009-02-18 15:18:37 UTC (rev 8575)
@@ -12,6 +12,8 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- OWS GetCapabilities should skip layers with status == MS_DELETE (#2582)
+
 - Set the default symbol size to 1 instead of 0 (#2896)
 
 - fix WMS LegendURL to print sld_version for 1.3.0 Capabilities (#473)

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2009-02-18 10:09:17 UTC (rev 8574)
+++ trunk/mapserver/mapogcsos.c	2009-02-18 15:18:37 UTC (rev 8575)
@@ -1368,6 +1368,10 @@
          for (i=0; i<map->numlayers; i++)
          {
              lp = (GET_LAYER(map, i));
+
+             if (lp->status == MS_DELETE)
+                continue;
+
              value = msOWSLookupMetadata(&(lp->metadata), "S", "offering_id");
              if (value)
              {

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2009-02-18 10:09:17 UTC (rev 8574)
+++ trunk/mapserver/mapwcs.c	2009-02-18 15:18:37 UTC (rev 8575)
@@ -670,7 +670,7 @@
   coverageMetadataObj cm;
   int status;
 
-  if(!msWCSIsLayerSupported(layer)) return MS_SUCCESS; /* not an error, this layer cannot be served via WCS */
+  if((layer->status == MS_DELETE) || !msWCSIsLayerSupported(layer)) return MS_SUCCESS; /* not an error, this layer cannot be served via WCS */
 
   status = msWCSGetCoverageMetadata(layer, &cm);
   if(status != MS_SUCCESS) return MS_FAILURE;

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2009-02-18 10:09:17 UTC (rev 8574)
+++ trunk/mapserver/mapwfs.c	2009-02-18 15:18:37 UTC (rev 8575)
@@ -441,6 +441,9 @@
       layerObj *lp;
       lp = GET_LAYER(map, i);
 
+      if (lp->status == MS_DELETE)
+         continue;
+
       /* List only vector layers in which DUMP=TRUE */
       if (msWFSIsLayerSupported(lp))
       {

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2009-02-18 10:09:17 UTC (rev 8574)
+++ trunk/mapserver/mapwms.c	2009-02-18 15:18:37 UTC (rev 8575)
@@ -2293,7 +2293,7 @@
          layerObj *lp;
          lp = (GET_LAYER(map, i));
 
-         if (pabLayerProcessed[i])
+         if (pabLayerProcessed[i] || (lp->status == MS_DELETE))
              continue;  /* Layer has already been handled */