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

[nobody at svn.erp5.org]

Author: alex
Date: Wed May 10 16:10:36 2006
New Revision: 7149

URL: http://svn.erp5.org?rev=7149&view=rev
Log:
Adds the ability to use a related_key as a keyword_search_key or
full_text_search_key.

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=7149&r1=7148&r2=7149&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed May 10 16:10:36 2006
@@ -1364,8 +1364,8 @@
 
     acceptable_key_map = self.getColumnMap()
     acceptable_keys = acceptable_key_map.keys()
-    full_text_search_keys = self.sql_catalog_full_text_search_keys
-    keyword_search_keys = self.sql_catalog_keyword_search_keys
+    full_text_search_keys = list(self.sql_catalog_full_text_search_keys)
+    keyword_search_keys = list(self.sql_catalog_keyword_search_keys)
     topic_search_keys = self.sql_catalog_topic_search_keys
     multivalue_keys = self.sql_catalog_multivalue_keys
 
@@ -1531,7 +1531,12 @@
               if not related_methods.has_key((table_list,method_id)):
                 related_methods[(table_list,method_id)] = 1
               # Prepend renamed table name
+              base_key = key
               key = "%s.%s" % (related_table_map[(table_list,method_id)][-1][-1], related_column[key])
+              if base_key in keyword_search_keys:
+                keyword_search_keys.append(key)
+              if base_key in full_text_search_keys:
+                full_text_search_keys.append(key)
             elif key_is_acceptable:
               if key.find('.') < 0:
                 # if the key is only used by one table, just append its name