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

[nobody at svn.erp5.org]

Author: aurel
Date: Wed Nov 28 10:57:41 2007
New Revision: 17851

URL: http://svn.erp5.org?rev=17851&view=rev
Log:
call on query must return result
propagate params from call to asSQLExpression on Query

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=17851&r1=17850&r2=17851&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed Nov 28 10:57:41 2007
@@ -326,8 +326,8 @@
     self.type = type
     self.search_key = key
 
-  def __call__(self):
-    self.asSQLExpression()
+  def __call__(self, **kw):
+    return self.asSQLExpression(**kw)
 
   def getRange(self):
     return self.range
@@ -384,7 +384,7 @@
     range_value = self.getRange()
     format = self.getFormat()
     if ignore_key:
-      pass
+      pass    
     elif range_value is not None:
       if isinstance(value, (list, tuple)):
         if format is None:
@@ -530,8 +530,8 @@
     # XXX: What is that used for ?! It's utterly dangerous.
     self.__dict__.update(kw)
 
-  def __call__(self):
-    self.asSQLExpression()
+  def __call__(self, **kw):
+    return self.asSQLExpression(**kw)
 
   def getQueryList(self):
     return self.query_list