FES - Don't cut the leading <Filter> tag any more

This corresponds to the patch in MapServer/MapScript which allows us to specify the whole filter.

OWS.py

@@ -357,14 +357,15 @@ class OWS:
 
         # cut off the opening and closing <Filter> tag
         # - this is needed for mapserver
-        root = etree.XML(fes)
-        msFilter = ""
-        for child in root:
-            msFilter += etree.tostring(child)
-        logging.debug("Setting the filter %s" % msFilter)
+        #root = etree.XML(fes)
+        #msFilter = ""
+        #for child in root:
+        #    msFilter += etree.tostring(child)
+        #logging.debug("Setting the filter %s" % msFilter)
 
         # set the filter
-        layerobj.setMetaData("wfs_filter",msFilter)
+        layerobj.setMetaData("wfs_filter",fes)
+        #layerobj.setMetaData("wfs_filter",msFilter)
 
         # save the mapfile - debugging
         mapobj.save("mapfile.fes")