[mapserver-commits] r9438 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-10-10 18:11:25 -0400 (Sat, 10 Oct 2009)
New Revision: 9438

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcsld.c
Log:
Correct sld generated from mapserver classes (#3133)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-10 15:01:44 UTC (rev 9437)
+++ trunk/mapserver/HISTORY.TXT	2009-10-10 22:11:25 UTC (rev 9438)
@@ -15,6 +15,7 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Correct sld generated from mapserver classes (#3133) 
 
 Version 5.6.0-beta3 (2009-10-07):
 ---------------------------------

Modified: trunk/mapserver/mapogcsld.c
===================================================================
--- trunk/mapserver/mapogcsld.c	2009-10-10 15:01:44 UTC (rev 9437)
+++ trunk/mapserver/mapogcsld.c	2009-10-10 22:11:25 UTC (rev 9438)
@@ -176,12 +176,12 @@
 /*      copy :  - class                                                 */
 /*              - layer's labelitem                                     */
 /* -------------------------------------------------------------------- */
-                if ((pszStyleLayerName == NULL && 
+                if ((pasLayers[j].name && pszStyleLayerName == NULL && 
                      ((strcasecmp(GET_LAYER(map, i)->name, pasLayers[j].name) == 0 ||
                       (pszTmp && strcasecmp(pszTmp, pasLayers[j].name) == 0))||
                      (GET_LAYER(map, i)->group && 
                        strcasecmp(GET_LAYER(map, i)->group, pasLayers[j].name) == 0))) ||
-                    (bUseSpecificLayer && pszStyleLayerName && 
+                    (bUseSpecificLayer && pszStyleLayerName && pasLayers[j].name &&
                      strcasecmp(pasLayers[j].name, pszStyleLayerName) == 0))
                 {
                     bSuccess =1;
@@ -4316,6 +4316,7 @@
               sprintf(szTmp, "<se:Name>%s</se:Name>\n", pszEncoded);
             else
               sprintf(szTmp, "<Name>%s</Name>\n", pszEncoded);
+	     pszFinalSLD = msStringConcatenate(pszFinalSLD, szTmp);
             msFree(pszEncoded);
         }
         else if (psLayer->name)