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

[svn at osgeo.org]

Author: assefa
Date: 2010-09-30 13:55:47 +0000 (Thu, 30 Sep 2010)
New Revision: 10549

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapogcfilter.c
Log:
Fix ProperyIsLike not used efficiently with Oracle (#3557)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-09-30 13:14:58 UTC (rev 10548)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-09-30 13:55:47 UTC (rev 10549)
@@ -14,6 +14,8 @@
 Current Version
 ---------------
 
+- Fix ProperyIsLike not used efficiently with Oracle (#3557) 
+
 - Fixed msOGRGetSymbolId according to the changes in gdal 1.8 (#3556)
 
 - Fixed crash when drawing a map using UNIQUE fid in the layer data (#3271)

Modified: branches/branch-5-6/mapserver/mapogcfilter.c
===================================================================
--- branches/branch-5-6/mapserver/mapogcfilter.c	2010-09-30 13:14:58 UTC (rev 10548)
+++ branches/branch-5-6/mapserver/mapogcfilter.c	2010-09-30 13:55:47 UTC (rev 10549)
@@ -2368,11 +2368,11 @@
     if (nCount > 1)
       return 0;
 
-    /*make sure that if there is properyisequal, it is the only one*/
-    if (psFilterNode->psLeftNode == NULL && psFilterNode->psRightNode == NULL)
+    /*make sure that it is the main and only node*/
+    if (strcasecmp(psFilterNode->pszValue, "PropertyIsLike") == 0)
       return 1;
-
-    return 0;
+    
+    return  0;
 }
 
 int FLTIsPropertyIsLikeFilter(FilterEncodingNode *psFilterNode)