WMS GetCapabilities w/Nested Groups

[jimk]

It looks like the previous seg-fault has been fixed but it looks like the fix introduced another bug. The problem is the </layer> tags are closing late in the getCapabilities request. The following patch against r6849 fixes it for me.

Index: mapwms.c
===================================================================
--- mapwms.c    (revision 6849)
+++ mapwms.c    (working copy)
@@ -1423,7 +1423,7 @@
      return MS_FALSE;
   }
   /* compare all groups below the current level */
-   for (i = 0; i < currentLevel; i++)
+   for (i = 0; i <= currentLevel; i++)
   {
      if (strncmp(currentGroups[i], otherGroups[i], strlen(currentGroups[i])) != 0)
      {

[dmorissette]

Checking...

[dmorissette]

Would you have a sample mapfile to use to reproduce and test this? No need for data, I just need the mapfile to run a getcapabilites on it.

[jimk]

Sample Mapfile

[jimk]

Notice in the sample mapfile the layer names also follow the hierarchy. So L.2.x should not be grouped under the L.1.x layers.

[dmorissette]

Thanks! I have verified that your proposed change solves the issue with your mapfile and also with the one that I had used for ticket #2122.

Too late to commit this in 5.0.0 which is planned for this coming Monday. This will have to wait until 5.0.1 after the official 5.0.0 release.

[jimk]

Thanks, that sounds good to me.

[dmorissette]

Patch committed to SVN trunk (r7295, v5.1) and branch-5-0 (r7297, v5.0.1)