[mapserver-commits] r7571 - branches/branch-5-0/mapserver

[svn at osgeo.org]

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

Modified:
   branches/branch-5-0/mapserver/HISTORY.TXT
   branches/branch-5-0/mapserver/mapogcsld.c
Log:
- mapogcsld.c: fetch TextSymbolizer/Label/ogc:PropertyName correctly (#2611) 


Modified: branches/branch-5-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-0/mapserver/HISTORY.TXT	2008-05-08 14:08:02 UTC (rev 7570)
+++ branches/branch-5-0/mapserver/HISTORY.TXT	2008-05-08 14:10:14 UTC (rev 7571)
@@ -13,6 +13,8 @@
 Current Version (future 5.0.3, svn branch-5-0)
 ----------------------------------------------
 
+- 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: branches/branch-5-0/mapserver/mapogcsld.c
===================================================================
--- branches/branch-5-0/mapserver/mapogcsld.c	2008-05-08 14:08:02 UTC (rev 7570)
+++ branches/branch-5-0/mapserver/mapogcsld.c	2008-05-08 14:10:14 UTC (rev 7571)
@@ -2464,7 +2464,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;