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

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Mar  5 15:19:10 2009
New Revision: 25884

URL: http://svn.erp5.org?rev=25884&view=rev
Log:
Pass RelatedKey.buildQuery's related_key_definition and sql_catalog parameters by name to make them easier to grep for.

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=25884&r1=25883&r2=25884&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Thu Mar  5 15:19:10 2009
@@ -1887,7 +1887,8 @@
       result = None
     else:
       if related_key_definition is not None:
-        search_key = search_key.getSearchKey(self, related_key_definition)
+        search_key = search_key.getSearchKey(sql_catalog=self,
+          related_key_definition=related_key_definition)
     return search_key
 
   @profiler_decorator
@@ -1905,13 +1906,15 @@
         if related_key_definition is None:
           build_key = search_key
         else:
-          build_key = search_key.getSearchKey(self, related_key_definition,
-                                               search_key_name=search_key_name)
+          build_key = search_key.getSearchKey(sql_catalog=self,
+            related_key_definition=related_key_definition,
+            search_key_name=search_key_name)
         result = build_key.buildQuery(value, logical_operator=logical_operator,
                                       comparison_operator=comparison_operator)
         if related_key_definition is not None:
-          result = search_key.buildQuery(self, related_key_definition,
-                                         search_value=result)
+          result = search_key.buildQuery(sql_catalog=self,
+            related_key_definition=related_key_definition,
+            search_value=result)
     else:
       result = script(value)
     return result
@@ -1966,11 +1969,13 @@
       if related_key_definition is None:
         build_key = search_key
       else:
-        build_key = search_key.getSearchKey(self, related_key_definition)
+        build_key = search_key.getSearchKey(sql_catalog=self,
+          related_key_definition=related_key_definition)
       result = self._buildQueryFromAbstractSyntaxTreeNode(node, build_key)
       if related_key_definition is not None:
-        result = search_key.buildQuery(self, related_key_definition,
-                                       search_value=result)
+        result = search_key.buildQuery(sql_catalog=self,
+          related_key_definition=related_key_definition,
+          search_value=result)
     return result
 
   @profiler_decorator