[Erp5-report] r21976 - /erp5/trunk/products/ERP5/Tool/DomainTool.py

[nobody at svn.erp5.org]

Author: seb
Date: Thu Jun 26 16:23:28 2008
New Revision: 21976

URL: http://svn.erp5.org?rev=21976&view=rev
Log:
add more brackets

Modified:
    erp5/trunk/products/ERP5/Tool/DomainTool.py

Modified: erp5/trunk/products/ERP5/Tool/DomainTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/DomainTool.py?rev=21976&r1=21975&r2=21976&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/DomainTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/DomainTool.py Thu Jun 26 16:23:28 2008
@@ -109,22 +109,22 @@
 #                 context.getProperty(property))
             value = context.getProperty(property)
             format_dict = {'base_name': base_name}
-            expression = "(%(base_name)s is NULL) AND " \
+            expression = "((%(base_name)s is NULL) AND " \
                          "(%(base_name)s_range_min is NULL) AND " \
-                         "(%(base_name)s_range_max is NULL)" % format_dict
+                         "(%(base_name)s_range_max is NULL))" % format_dict
             if value is not None:
               # Handle Mysql datetime correctly
               if isinstance(value, DateTime):
                 value = value.toZone('UTC').ISO()
               format_dict['value'] = value
               # Generate expression
-              expression += "OR (%(base_name)s = '%(value)s') " \
-                          "OR (%(base_name)s_range_min <= '%(value)s') AND " \
-                              "(%(base_name)s_range_max is NULL) " \
-                          "OR (%(base_name)s_range_min is NULL) AND " \
-                              "%(base_name)s_range_max > '%(value)s' " \
-                          "OR (%(base_name)s_range_min <= '%(value)s') AND " \
-                              "%(base_name)s_range_max > '%(value)s' " \
+              expression += " OR (%(base_name)s = '%(value)s') " \
+                          "OR ((%(base_name)s_range_min <= '%(value)s') AND " \
+                              "(%(base_name)s_range_max is NULL)) " \
+                          "OR ((%(base_name)s_range_min is NULL) AND " \
+                              "%(base_name)s_range_max > '%(value)s)' " \
+                          "OR ((%(base_name)s_range_min <= '%(value)s') AND " \
+                              "%(base_name)s_range_max > '%(value)s)' " \
                             % format_dict
             expression = '( %s )' % expression
             expression_list.append(expression)