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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Aug 23 10:52:44 2010
New Revision: 37941

URL: http://svn.erp5.org?rev=37941&view=rev
Log:
add sql_catalog_search_keys, that makes it possible to customise Column - SearchKey mappings.

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=37941&r1=37940&r2=37941&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Mon Aug 23 10:52:44 2010
@@ -451,6 +451,11 @@ class Catalog(Folder,
       'type'    : 'selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
+    { 'id': 'sql_catalog_search_keys',
+      'title': 'Search Key Mappings',
+      'description': 'A list of Search Key mappings',
+      'type': 'lines',
+      'mode': 'w' },
     { 'id'      : 'sql_catalog_keyword_search_keys',
       'description' : 'Columns which should be considered as full text search',
       'type'    : 'multiple selection',
@@ -544,6 +549,7 @@ class Catalog(Folder,
   sql_catalog_index = ''
   sql_unique_values = ''
   sql_catalog_paths = ''
+  sql_catalog_search_keys = ()
   sql_catalog_keyword_search_keys =  ()
   sql_catalog_datetime_search_keys = ()
   sql_catalog_full_text_search_keys = ()
@@ -2265,6 +2271,12 @@ class Catalog(Folder,
           LOG('SQLCatalog', WARNING, 'Ambiguous configuration: column %r is set to use %r key, but also to use %r key. Former takes precedence.' % (column, result[column], key))
         else:
           result[column] = key
+    for line in self.sql_catalog_search_keys:
+      try:
+        column, key = [x.strip() for x in line.split('|', 2)]
+        result[column] = key
+      except ValueError:
+        LOG('SQLCatalog', WARNING, 'Wrong configuration for sql_catalog_search_keys: %r' % line)
     return result
 
   @profiler_decorator