Added 2 utility methods.

 - getFilterDict return the filter dictionary as a dict (Instead a PersistentMapping), this allow devoloper manipulate it using Python Scripts at ZODB.

 - setFilterExpression allows set tales to a single filter, instead use edit to edit all. 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35660 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ZSQLCatalog/SQLCatalog.py

@@ -2456,6 +2456,20 @@ class Catalog(Folder,
         return None
     return None
 
+  def setFilterExpression(self, method_name, expression):
+    """ Set the Expression for a certain method name. This allow set 
+        expressions by scripts.
+    """
+    if withCMF:
+      if getattr(aq_base(self), 'filter_dict', None) is None:
+        self.filter_dict = PersistentMapping()
+        return None
+      self.filter_dict[method_name]['expression'] = expression
+      if expression:
+        self.filter_dict[method_name]['expression_instance'] = Expression(expression)
+      else:
+        self.filter_dict[method_name]['expression_instance'] = None
+
   def isPortalTypeSelected(self, method_name, portal_type):
     """ Returns true if the portal type is selected for this method.
       XXX deprecated
@@ -2485,6 +2499,25 @@ class Catalog(Folder,
         return []
     return []
 
+  def getFilterDict(self):
+    """
+      Utility Method.
+      Filter Dict is a dictionary and used at Python Scripts, 
+      This method returns a filter dict as a dictionary.
+    """
+    if withCMF:
+      if getattr(aq_base(self), 'filter_dict', None) is None:
+        self.filter_dict = PersistentMapping()
+        return None
+      filter_dict = {}
+      for key in self.filter_dict:
+        # Filter is also a Persistence dict.
+        filter_dict[key] = {}
+        for sub_key in self.filter_dict[key]:
+           filter_dict[key][sub_key] = self.filter_dict[key][sub_key]
+      return filter_dict
+    return None
+
   def getFilterableMethodList(self):
     """
     Returns only zsql methods wich catalog or uncatalog objets

product/ZSQLCatalog/tests/testZSQLCatalog.py

@@ -72,6 +72,30 @@ class TestSQLCatalog(unittest.TestCase):
     self.assertEquals('python: 1', self._catalog.getExpression('z_dummy_method'))
     self.assertEquals('', self._catalog.getExpression('not_exists'))
 
+  def test_setFilterExpression(self):
+    request = dict(z_dummy_method_box=1, z_dummy_method_expression='python: 1')
+    self._catalog.manage_editFilter(REQUEST=request)
+    expression = self._catalog.getExpressionInstance('z_dummy_method')
+    self._catalog.setFilterExpression('z_dummy_method', 'python: 2')
+    self.assertEquals('python: 2', self._catalog.getExpression('z_dummy_method'))
+    self.assertNotEquals(expression, 
+                         self._catalog.getExpressionInstance('z_dummy_method'))
+    self._catalog.setFilterExpression('z_dummy_method', 'python: 1')
+    self.assertEquals('python: 1', self._catalog.getExpression('z_dummy_method'))
+    self.assertRaises(KeyError, self._catalog.setFilterExpression, 
+                                'not_exists', "python:1")
+    self.assertEquals('', self._catalog.getExpression('not_exists'))
+
+  def test_getFilterDict(self):
+    request = dict(z_dummy_method_box=1, z_dummy_method_expression='python: 1')
+    self._catalog.manage_editFilter(REQUEST=request)
+    filter_dict = self._catalog.getFilterDict()
+    self.assertEquals(self._catalog.filter_dict.keys(), filter_dict.keys())
+    self.assertTrue(isinstance(filter_dict, type({})))
+    self.assertTrue(isinstance(filter_dict['z_dummy_method'], type({})))
+    self.assertEquals(self._catalog.getExpression('z_dummy_method'), 
+                      filter_dict['z_dummy_method']['expression'])
+
   def test_getFilterExpressionInstance(self):
     request = dict(z_dummy_method_box=1, z_dummy_method_expression='python: 1')
     self._catalog.manage_editFilter(REQUEST=request)