[mapserver-commits] r7570 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-05-08 10:08:02 -0400 (Thu, 08 May 2008)
New Revision: 7570

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcsld.c
Log:
mapogcsld.c: fetch TextSymbolizer/Label/ogc:PropertyName correctly (#2611)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-05-07 06:43:15 UTC (rev 7569)
+++ trunk/mapserver/HISTORY.TXT	2008-05-08 14:08:02 UTC (rev 7570)
@@ -13,6 +13,8 @@
 Current Version (5.1-dev, SVN trunk):
 -------------------------------------
 
+- mapogcsld.c: fetch TextSymbolizer/Label/ogc:PropertyName correctly (#2611)
+
 - Don't ignore .qix file when DATA reference includes .shp extension (#590)
 
 - CGI able to alter layers with space and underscores (#2516)

Modified: trunk/mapserver/mapogcsld.c
===================================================================
--- trunk/mapserver/mapogcsld.c	2008-05-07 06:43:15 UTC (rev 7569)
+++ trunk/mapserver/mapogcsld.c	2008-05-08 14:08:02 UTC (rev 7570)
@@ -2515,7 +2515,7 @@
                              psTmpNode->psChild &&
                              psTmpNode->psChild->pszValue)
                     {
-                        sprintf(szTmp, "[%s]", psTmpNode->psChild->pszValue);
+                        sprintf(szTmp, "[%s]", CPLGetXMLValue(psTmpNode, NULL, NULL));
                         pszClassText = msStringConcatenate(pszClassText, szTmp);
                     }
                     psTmpNode = psTmpNode->psNext;