[Erp5-report] r25946 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Mar 10 15:50:26 2009
New Revision: 25946

URL: http://svn.erp5.org?rev=25946&view=rev
Log:
Rename operator into logical_operator to make the purpose clear.
Use explicitly logical_operator API on ComplexQuery.

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

Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=25946&r1=25945&r2=25946&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Tue Mar 10 15:50:26 2009
@@ -1935,11 +1935,11 @@
           subquery = self._buildQueryFromAbstractSyntaxTreeNode(subnode, search_key)
           if subquery is not None:
             append(subquery)
-      operator = node.getLogicalOperator()
+      logical_operator = node.getLogicalOperator()
       for comparison_operator, value_list in value_dict.iteritems():
-        append(search_key.buildQuery(value_list, comparison_operator=comparison_operator, logical_operator=operator))
-      if operator == 'not' or len(query_list) > 1:
-        result = ComplexQuery(query_list, operator=operator)
+        append(search_key.buildQuery(value_list, comparison_operator=comparison_operator, logical_operator=logical_operator))
+      if logical_operator == 'not' or len(query_list) > 1:
+        result = ComplexQuery(query_list, logical_operator=logical_operator)
       elif len(query_list) == 1:
         result = query_list[0]
       else: