[mapserver-commits] r11847 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-06-23 06:34:53 -0700 (Thu, 23 Jun 2011)
New Revision: 11847

Modified:
   trunk/mapserver/mapwms.c
Log:
Fixed handling of wms_enable_request vs GetCapabilities on GROUPed layers (#3931)

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2011-06-22 14:34:54 UTC (rev 11846)
+++ trunk/mapserver/mapwms.c	2011-06-23 13:34:53 UTC (rev 11847)
@@ -2673,7 +2673,8 @@
                  for(j=i; j<map->numlayers; j++)
                    if (!pabLayerProcessed[j] &&
                        GET_LAYER(map, j)->group &&
-                       strcmp(lp->group, GET_LAYER(map, j)->group) == 0 )
+                       strcmp(lp->group, GET_LAYER(map, j)->group) == 0 &&
+                       msIntegerInArray(GET_LAYER(map, j)->index, ows_request->enabled_layers, ows_request->numlayers))
                      group_layers[num_layers++] = j;
                  if ( num_layers > 0)
                  {
@@ -2741,7 +2742,8 @@
              {
                  if (!pabLayerProcessed[j] &&
                      GET_LAYER(map, j)->group &&
-                     strcmp(lp->group, GET_LAYER(map, j)->group) == 0 )
+                     strcmp(lp->group, GET_LAYER(map, j)->group) == 0 &&
+                     msIntegerInArray(GET_LAYER(map, j)->index, ows_request->enabled_layers, ows_request->numlayers))
                  {
                      msDumpLayer(map, (GET_LAYER(map, j)), nVersion, script_url_encoded, "  ");
                      pabLayerProcessed[j] = 1;