[Erp5-report] r25948 - /erp5/trunk/products/ZSQLCatalog/Query/ComplexQuery.py

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Mar 10 16:33:18 2009
New Revision: 25948

URL: http://svn.erp5.org?rev=25948&view=rev
Log:
Instead of computing SearchText representation from internal comparison operator representation, use a dict.

Modified:
    erp5/trunk/products/ZSQLCatalog/Query/ComplexQuery.py

Modified: erp5/trunk/products/ZSQLCatalog/Query/ComplexQuery.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/Query/ComplexQuery.py?rev=25948&r1=25947&r2=25948&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/Query/ComplexQuery.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/Query/ComplexQuery.py [utf8] Tue Mar 10 16:33:18 2009
@@ -34,6 +34,11 @@
 from Products.ZSQLCatalog.Interface.IQuery import IQuery
 from Interface.Verify import verifyClass
 from Products.ZSQLCatalog.SQLCatalog import profiler_decorator
+
+logical_operator_search_text_dict = {
+  'and': 'AND',
+  'or': 'OR',
+}
 
 class ComplexQuery(Query):
   """
@@ -97,11 +102,11 @@
     if len(search_text_list) == 0:
       result = ''
     else:
-      if self.logical_operator in ('and', 'or'):
+      if self.logical_operator in logical_operator_search_text_dict:
         if len(search_text_list) == 1:
           result = search_text_list[0]
         else:
-          logical_operator = ' %s ' % (self.logical_operator.upper(), )
+          logical_operator = ' %s ' % (logical_operator_search_text_dict[self.logical_operator], )
           result = '(%s)' % (logical_operator.join(search_text_list), )
       elif self.logical_operator == 'not':
         assert len(search_text_list) == 1