[mapserver-commits] r9612 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-12-10 14:16:19 -0500 (Thu, 10 Dec 2009)
New Revision: 9612

Modified:
   trunk/mapserver/mapogcfilter.c
   trunk/mapserver/mapwfs.c
Log:
Add debug output whne using OGCFilter #3052

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2009-12-09 21:43:42 UTC (rev 9611)
+++ trunk/mapserver/mapogcfilter.c	2009-12-10 19:16:19 UTC (rev 9612)
@@ -942,6 +942,7 @@
     int bConcatWhere = 0;
     int bHasAWhere =0;
     char *pszTmp = NULL;
+    char *tmpfilename = NULL;
 
     lp = (GET_LAYER(map, iLayerIndex));
 
@@ -1090,6 +1091,25 @@
     map->query.layer = lp->index;
     map->query.rect = sQueryRect;
 
+    if(map->debug == MS_DEBUGLEVEL_VVV)
+    {
+        tmpfilename = msTmpFile(map->mappath, map->web.imagepath, "_filter.map");
+        if (tmpfilename == NULL)
+        {
+#ifndef _WIN32
+            tmpfilename = msTmpFile(NULL, "/tmp/", "_filter.map" );
+#else
+            tmpfilename = msTmpFile(NULL, "C:\\", "_filter.map");
+#endif
+        }
+        if (tmpfilename)
+        {
+            msSaveMap(map,tmpfilename);
+            msDebug("FLTApplySimpleSQLFilter(): Map file after Filter was applied %s", tmpfilename);
+            msFree(tmpfilename);
+        }
+    }
+
     return msQueryByRect(map);
 
     /* return MS_SUCCESS; */

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2009-12-09 21:43:42 UTC (rev 9611)
+++ trunk/mapserver/mapwfs.c	2009-12-10 19:16:19 UTC (rev 9612)
@@ -1186,6 +1186,7 @@
                         papszPropertyName[k] = msReplaceSubstring(papszPropertyName[i], pszFullName, lp->items[z]);
                   
                   }
+                  msLayerClose(lp);
               }