[mapserver-commits] r10460 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-08-18 22:01:15 +0000 (Wed, 18 Aug 2010)
New Revision: 10460

Modified:
   trunk/mapserver/mapogcfilter.c
   trunk/mapserver/mapogcsld.c
Log:
OGC Filter : matchCase attribute does not work #3521

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2010-08-18 15:19:33 UTC (rev 10459)
+++ trunk/mapserver/mapogcfilter.c	2010-08-18 22:01:15 UTC (rev 10460)
@@ -3601,7 +3601,8 @@
         }
     }   
     szTmp[iTmp] = '/';
-    if (bCaseInsensitive == 1)
+    /*disable it fot now since things like [NAME]" =~ /^Sydney/i do not work #3521 */
+    if (0)/*bCaseInsensitive == 1)*/
     {
       szTmp[++iTmp] = 'i';
     } 

Modified: trunk/mapserver/mapogcsld.c
===================================================================
--- trunk/mapserver/mapogcsld.c	2010-08-18 15:19:33 UTC (rev 10459)
+++ trunk/mapserver/mapogcsld.c	2010-08-18 22:01:15 UTC (rev 10460)
@@ -5198,9 +5198,16 @@
         {
             int len = strlen(pszFinalAttributeValue);
             msStringTrimBlanks(pszFinalAttributeValue);
-            if (pszFinalAttributeValue[0] == '/' &&  pszFinalAttributeValue[len-1] == '/')
+            if (pszFinalAttributeValue[0] == '/' &&  
+                (pszFinalAttributeValue[len-1] == '/' ||
+                 (pszFinalAttributeValue[len-1] == 'i' && 
+                  pszFinalAttributeValue[len-2] == '/')))
             {
-                pszFinalAttributeValue[len-1] = '\0';
+                if (pszFinalAttributeValue[len-1] == '/')
+                  pszFinalAttributeValue[len-1] = '\0';
+                else
+                  pszFinalAttributeValue[len-2] = '\0';
+
                 memmove(pszFinalAttributeValue, pszFinalAttributeValue +
                         ((pszFinalAttributeValue[1] == '^') ? 2 : 1), len-1);