[mapserver-commits] r11640 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-05-03 14:24:38 -0700 (Tue, 03 May 2011)
New Revision: 11640

Modified:
   trunk/mapserver/mapogcfilter.c
   trunk/mapserver/mapogcsld.c
Log:
Fix SLD containing a PropertyIsLike filter (#3855)

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2011-05-03 20:14:12 UTC (rev 11639)
+++ trunk/mapserver/mapogcfilter.c	2011-05-03 21:24:38 UTC (rev 11640)
@@ -403,13 +403,13 @@
 	    }
 	    else
 	    {
-              szExpression = FLTGetMapserverExpression(psNode, lp);
+              szExpression = FLTGetCommonExpression(psNode, lp);
 	    }
 	}
     }
     else
     {
-      szExpression = FLTGetMapserverExpression(psNode, lp);
+      szExpression = FLTGetCommonExpression(psNode, lp);
         
     }
    

Modified: trunk/mapserver/mapogcsld.c
===================================================================
--- trunk/mapserver/mapogcsld.c	2011-05-03 20:14:12 UTC (rev 11639)
+++ trunk/mapserver/mapogcsld.c	2011-05-03 21:24:38 UTC (rev 11640)
@@ -835,7 +835,7 @@
                                     FLTPreParseFilterForAlias(psNode, psLayer->map, j, "G");
                                 }
 
-                                szExpression = FLTGetMapserverExpression(psNode, psLayer);
+                                szExpression = FLTGetCommonExpression(psNode, psLayer);
 
 /* ==================================================================== */
 /*      If the filter has a spatial filter or is a simple, we keep      */