Changeset 5135

Timestamp:

03/17/09 11:51:49 (3 years ago)

Author:

pedro.gato

Message:

This makes dBizobj.filter() VirtualField? aware, they are handled after the real fields, creating a fake filter.
Also modify datanav SelectPage? to work with VirtualFields?, no changes to user code needed, VirtualFields? are now treated as any other ordinary field

Files:

• trunk/dabo/biz/dBizobj.py (modified) (2 diffs)
• trunk/dabo/db/dCursorMixin.py (modified) (1 diff)
• trunk/dabo/db/dDataSet.py (modified) (1 diff)
• trunk/dabo/lib/datanav/Page.py (modified) (3 diffs)

trunk/dabo/biz/dBizobj.py

@@ -37 +37 @@
-        # now the DefaultValues property (used to be self.defaultValues attribute)
-        self._defaultValues = {}
+
+        # PKId's of rows to be filtered out when
+        # filtering Virtual fields
+        self.__filterPKVirtual = []
-
-        self._beforeInit()
@@ -995 +999 @@
-            contains: expr in fld
-        """
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                # The old row was filtered out of the dataset
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def removeFilter(self):

trunk/dabo/db/dCursorMixin.py

@@ -1181 +1181 @@
-        self._records = self._records.filter(fld=fld, expr=expr, op=op)
-
+    def filterByExpression(self, expr):
+        """Allows you to filter by any expression that would make a
+        valid 'where' clause in SQLite.
+        """
+        self._records = self._records.filterByExpression(expr)
-
-    def removeFilter(self):

trunk/dabo/db/dDataSet.py

@@ -211 +211 @@
-        valid 'where' clause in SQLite.
-        """
+        if not self:
+            # No rows, so nothing to filter
+            return self
+
-        stmnt = "select * from dataset where %s" % (expr)
-        ret = self.execute(stmnt)

trunk/dabo/lib/datanav/Page.py

@@ -131 +131 @@
-        self.selectFields = {}
-        self.sortFields = {}
+        self.__virtualFilters = []
-        self.sortIndex = 0
-    
@@ -243 +244 @@
-        whr = ""
-        for fld in flds:
+            if biz.VirtualFields.has_key(fld):
+                #virtual field, save for later use and ignore
+                self.__virtualFilters.append(fld)
+                continue
-            if fld == "limit":
-                # Handled elsewhere
@@ -367 +372 @@
-            ret = frm.requery(_fromSelectPage=True)
-
+        if bizobj.RowCount > 0: # don't bother applying this if there are no records to work on
+            # filter virtual fields
+            for vField in self.__virtualFilters:
+                opVal = self.selectFields[vField]["op"].Value
+                ctrl = self.selectFields[vField]["ctrl"]
+
+                if not _(IGNORE_STRING) in opVal:
+                    bizobj.filter(vField, ctrl.Value, opVal.lower())
+
-        if ret:
-            if self.Parent.SelectedPageNumber == 0: