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

[nobody at svn.erp5.org]

Author: jp
Date: Fri Feb 23 10:31:47 2007
New Revision: 12986

URL: http://svn.erp5.org?rev=12986&view=rev
Log:
Added placeholder for scriptable keys

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=12986&r1=12985&r2=12986&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Fri Feb 23 10:31:47 2007
@@ -310,7 +310,6 @@
     else:
       where_expression.append("%s = %s" % (key, self._quoteSQLString(value)))
 
-
     if len(where_expression)>0:
       if len(where_expression)==1:
         where_expression = where_expression[0]
@@ -339,7 +338,7 @@
   """
   Used in order to concatenate many queries
   """
-  def __init__(self,*args,**kw):
+  def __init__(self, *args, **kw):
     self.query_list = args
     operator = None
     if kw.has_key('operator'):
@@ -347,7 +346,7 @@
       del kw['operator']
     if operator is None:
       operator = 'AND'
-    self.operator=operator
+    self.operator = operator
     self.__dict__.update(kw)
 
   def __call__(self):
@@ -356,11 +355,11 @@
   def getQueryList(self):
     return self.query_list
 
-  def asSQLExpression(self,key_alias_dict=None,
-                           ignore_empty_string=1,
-                           keyword_search_keys=None,
-                           full_text_search_keys=None,
-                           stat__=0):
+  def asSQLExpression(self, key_alias_dict=None,
+                            ignore_empty_string=1,
+                            keyword_search_keys=None,
+                            full_text_search_keys=None,
+                            stat__=0):
     """
     Build the sql string
     """
@@ -639,6 +638,11 @@
     { 'id'      : 'sql_catalog_related_keys',
       'title'   : 'Related keys',
       'description' : 'Additional columns obtained through joins',
+      'type'    : 'lines',
+      'mode'    : 'w' },
+    { 'id'      : 'sql_catalog_scriptable_keys',
+      'title'   : 'Related keys',
+      'description' : 'Virtual columns to generate scriptable scriptable queries',
       'type'    : 'lines',
       'mode'    : 'w' },
   )
@@ -672,6 +676,7 @@
   sql_catalog_topic_search_keys = ()
   sql_catalog_multivalue_keys = ()
   sql_catalog_related_keys = ()
+  sql_catalog_scriptable_keys = ()
 
   # These are ZODB variables, so shared by multiple Zope instances.
   # This is set to the last logical time when clearReserved is called.
@@ -1665,7 +1670,7 @@
   getSqlCatalogRelatedKeyList = getSQLCatalogRelatedKeyList
 
   def buildSQLQuery(self, query_table='catalog', REQUEST=None,
-                          ignore_empty_string=1, query=None,stat__=0,**kw):
+                          ignore_empty_string=1, query=None, stat__=0, **kw):
     """ Builds a complex SQL query to simulate ZCalatog behaviour """
     # Get search arguments:
     if REQUEST is None and (kw is None or kw == {}):