Changeset 648

Timestamp:

03/28/07 08:35:47

Author:

cph

Message:

fixes #104:better compatability with mapserver attribute notation in filters

Files:

• PCL/trunk/PCL-Core/cartography/data/postgis.py (modified) (2 diffs)
• PCL/trunk/PCL-Core/tests/testpgfeatures.py (modified) (1 diff)

PCL/trunk/PCL-Core/cartography/data/postgis.py

@@ -98 +98 @@
-from zope.interface import implements
-
+PATTERN_ATTR_WITHOUT_F=re.compile(r"[^f](\[[a-z 0-9_\"\']+\])|^(\[[a-z 0-9_\"\']+\])")
+PATTERN_ATTR=re.compile(r"\[([a-z 0-9_\"\']+)\]")
-
-# ============================================================================
@@ -770 +772 @@
-        self.hasfrontfilter = 0
-        if filter is not None:
+            while 1:
+                match = PATTERN_ATTR_WITHOUT_F.search(filter)
+                if not match:
+                    break;
+                repl = match.group(1) or match.group(2)
+                attrMatch = PATTERN_ATTR.search(repl)
+                if attrMatch.group(1)[0] not in ["'", '"']:
+                    unquotedAttr = attrMatch.group(1)
+                    filter = filter.replace(repl,"f['"+unquotedAttr+"']")
+                else:
+                    filter = filter.replace(repl,"f"+repl)
+
-            self._compiled_filter = compile(filter, 'string', 'eval')
-            self._locals = {}

PCL/trunk/PCL-Core/tests/testpgfeatures.py

@@ -355 +355 @@
-            i += 1
-        self.assert_(i == 46, i)
+    def filter_test(self,subfilt):
+        b = BoundingBox(-10, 45, 10, 60)
+        source = self.store.source(TYPENAME0, bbox=b)
+        def func(s):
+            return s.lower()
+        ff = "func(%s) == 'uk'" % subfilt
+        fiter = source(filter=ff, func=func)
+        i = 0
+        for feature in fiter:
+            i += 1
+        self.assert_(i == 46, subfilt)
+    def test_filters(self):
+        for filt in ( "[fips_cntry]", "['fips_cntry']", '["fips_cntry"]', 
+                        "f['fips_cntry']", "f.fips_cntry"):
+            self.filter_test(filt)
-    def test_front_geom(self):
-        b = BoundingBox(-10, 45, 10, 60)