[Erp5-report] r26551 - /erp5/trunk/products/ERP5/Document/Predicate.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Apr 21 13:51:11 2009
New Revision: 26551

URL: http://svn.erp5.org?rev=26551&view=rev
Log:
range criterion should be able to removed after configuration.

Modified:
    erp5/trunk/products/ERP5/Document/Predicate.py

Modified: erp5/trunk/products/ERP5/Document/Predicate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Predicate.py?rev=26551&r1=26550&r2=26551&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Predicate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Predicate.py [utf8] Tue Apr 21 13:51:11 2009
@@ -376,12 +376,22 @@
                   is greater than max
 
     """
+    # XXX 'min' and 'max' are built-in functions.
     if getattr(aq_base(self), '_identity_criterion', None) is None:
       self._identity_criterion = {}
       self._range_criterion = {}
     if identity is not None :
       self._identity_criterion[property] = identity
-    if min != '' or max != '' :
+    if min == '':
+      min = None
+    if max == '':
+      max = None
+    if min is None and max is None:
+      try:
+        del self._range_criterion[property]
+      except KeyError:
+        pass
+    else:
       self._range_criterion[property] = (min, max)
     self.reindexObject()