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

[svn at osgeo.org]

Author: assefa
Date: 2010-03-03 12:13:44 -0500 (Wed, 03 Mar 2010)
New Revision: 9910

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapogcfilter.c
Log:
Backport fix for WFS OGC filters regex tests #3289

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-03 16:37:47 UTC (rev 9909)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-03 17:13:44 UTC (rev 9910)
@@ -15,6 +15,8 @@
 Current Version (SVN branch-5-6):
 --------------------------------
 
+- 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)
@@ -29,8 +31,6 @@
 - Got rid of invalid warning about missing EPSG proj in WMs GetCapabilities
   when map has a valid EPSG proj, but layer doesn't (#2028)
 
-Current Version
----------------
 
 - Correct one pass query problems and OGC filter query (#3305)
 

Modified: branches/branch-5-6/mapserver/mapogcfilter.c
===================================================================
--- branches/branch-5-6/mapserver/mapogcfilter.c	2010-03-03 16:37:47 UTC (rev 9909)
+++ branches/branch-5-6/mapserver/mapogcfilter.c	2010-03-03 17:13:44 UTC (rev 9910)
@@ -73,7 +73,7 @@
         if (!bString)
           return MS_TRUE;
 #else
-        if (msEvalRegex("[-+]?\\b([0-9]*\\.[0-9]+|[0-9]+)\\b", pszValue) == MS_TRUE)
+	if (msEvalRegex("^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$", pszValue) == MS_TRUE)
           return MS_TRUE;
 #endif
     }