Add logical operator utility functions.

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

product/ZSQLCatalog/SQLCatalog.py

@@ -2502,6 +2502,12 @@ from Query.AutoQuery import AutoQuery as Query
 def NegatedQuery(query):
   return ComplexQuery(query, logical_operator='not')
 
+def AndQuery(*args):
+  return ComplexQuery(logical_operator='and', *args)
+
+def OrQuery(*args):
+  return ComplexQuery(logical_operator='or', *args)
+
 allow_class(SimpleQuery)
 allow_class(ComplexQuery)
 

product/ZSQLCatalog/__init__.py

@@ -43,7 +43,7 @@ def initialize(context):
 
 from AccessControl import ModuleSecurityInfo, ClassSecurityInfo
 ModuleSecurityInfo('Products.ZSQLCatalog.SQLCatalog').declarePublic(
-            'ComplexQuery', 'Query', 'NegatedQuery',)
+            'ComplexQuery', 'Query', 'NegatedQuery', 'AndQuery', 'OrQuery')
 
 from Query import Query, SimpleQuery
 from SearchKey import SearchKey