[Erp5-report] r28762 - in /erp5/trunk/products/ZSQLCatalog: SQLCatalog.py __init__.py

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Sep  3 05:08:24 2009
New Revision: 28762

URL: http://svn.erp5.org?rev=28762&view=rev
Log:
Add logical operator utility functions.

Modified:
    erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
    erp5/trunk/products/ZSQLCatalog/__init__.py

Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=28762&r1=28761&r2=28762&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Thu Sep  3 05:08:24 2009
@@ -2502,6 +2502,12 @@
 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)
 

Modified: erp5/trunk/products/ZSQLCatalog/__init__.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/__init__.py?rev=28762&r1=28761&r2=28762&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/__init__.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/__init__.py [utf8] Thu Sep  3 05:08:24 2009
@@ -43,7 +43,7 @@
 
 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
+from SearchKey import SearchKey