[mapserver-commits] r9912 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-03-03 12:36:54 -0500 (Wed, 03 Mar 2010)
New Revision: 9912

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapogcsld.c
Log:
Backport fix for SLD filters column names detection #3052

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-03 17:32:37 UTC (rev 9911)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-03 17:36:54 UTC (rev 9912)
@@ -15,8 +15,10 @@
 Current Version (SVN branch-5-6):
 --------------------------------
 
-- Backport fix for WFS OGC filters regex tests #3289
+- Backport fix for SLD filters column names detection (#3052)
 
+- Backport fix for WFS OGC filters regex tests (#3289)
+
 - Fix crash with GRID layers with no classes (#3352)
 
 - Avoid memory error when building SQL bbox (#3324)

Modified: branches/branch-5-6/mapserver/mapogcsld.c
===================================================================
--- branches/branch-5-6/mapserver/mapogcsld.c	2010-03-03 17:32:37 UTC (rev 9911)
+++ branches/branch-5-6/mapserver/mapogcsld.c	2010-03-03 17:36:54 UTC (rev 9912)
@@ -641,8 +641,8 @@
     layerObj *psCurrentLayer = NULL;
     const char *pszWmsName=NULL;
     int j=0;
+    const char *key=NULL;
 
-
     if (psRoot && psLayer)
     {
         psUserStyle = CPLGetXMLNode(psRoot, "UserStyle");
@@ -734,11 +734,23 @@
                                 }
                                 if (j < psLayer->map->numlayers)
                                 {
+				    /*make sure that the tmp layer has all the metadata that
+				      the orinal layer has, allowing to do parsing for
+				      such things as gml_attribute_type #3052*/
+				    while (1) 
+				    {
+					key = msNextKeyFromHashTable(&psCurrentLayer->metadata, key);
+					if (!key) 
+					  break;
+					else 
+					  msInsertHashTable(&psLayer->metadata, key, 
+							    msLookupHashTable(&psCurrentLayer->metadata, key));
+				    }
                                    
                                     FLTPreParseFilterForAlias(psNode, psLayer->map, j, "G");
                                 }
+				
 
-
 /* ==================================================================== */
 /*      If the filter has a spatial filter or is a simple, we keep      */
 /*      the node. This node will be parsed when applying the SLD and    */