[mapserver-commits] r9045 - trunk/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2009-05-28 13:00:45 -0400 (Thu, 28 May 2009)
New Revision: 9045

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mappostgis.c
Log:
Fix filter error in multi-clause filters (#2937)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-05-28 13:10:17 UTC (rev 9044)
+++ trunk/mapserver/HISTORY.TXT	2009-05-28 17:00:45 UTC (rev 9045)
@@ -13,6 +13,9 @@
 
 Current Version (SVN trunk):
 ----------------------------
+
+- Fix filter error in multi-clause filters (#2937)
+
 - Fix agg freetype character lookup when no unicode charmap is present (#3018)
 
 - Fix memory leak in SQL building (#2997)

Modified: trunk/mapserver/mappostgis.c
===================================================================
--- trunk/mapserver/mappostgis.c	2009-05-28 13:10:17 UTC (rev 9044)
+++ trunk/mapserver/mappostgis.c	2009-05-28 17:00:45 UTC (rev 9045)
@@ -1196,7 +1196,9 @@
 
     /* Populate strFilter, if necessary. */
     if ( layer->filter.string ) {
-        strFilter = strdup(layer->filter.string);
+        static char *strFilterTemplate = "(%s)";
+        strFilter = (char*)malloc(strlen(strFilterTemplate) + strlen(layer->filter.string));
+        sprintf(strFilter, strFilterTemplate, layer->filter.string);
         strFilterLength = strlen(strFilter);
     }