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

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Aug 29 13:58:59 2007
New Revision: 15908

URL: http://svn.erp5.org?rev=15908&view=rev
Log:
It's faster (O(1) instead of O(n)) to search a value in dict keys that in a list, so use dict when possible.

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=15908&r1=15907&r2=15908&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed Aug 29 13:58:59 2007
@@ -1900,7 +1900,6 @@
       kw = REQUEST
 
     acceptable_key_map = self.getColumnMap()
-    acceptable_keys = acceptable_key_map.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
@@ -2008,7 +2007,7 @@
     # Define related maps
     # each tuple from `related_tuples` has the form (key,
     # 'table1,table2,table3/column/where_expression')
-    related_keys = []
+    related_keys = {}
     related_method = {}
     related_table_map = {}
     related_column = {}
@@ -2020,7 +2019,7 @@
       key = t_tuple[0].strip()
       if key in key_list:
         join_tuple = t_tuple[1].strip().split('/')
-        related_keys.append(key)
+        related_keys[key] = None
         method_id = join_tuple[2]
         table_list = tuple(join_tuple[0].split(','))
         related_method[key] = method_id
@@ -2041,14 +2040,14 @@
     # We take additional parameters from the REQUEST
     # and give priority to the REQUEST
     if REQUEST is not None:
-      for key in acceptable_keys:
+      for key in acceptable_key_map.iterkeys():
         if REQUEST.has_key(key):
           # Only copy a few keys from the REQUEST
           if key in self.sql_catalog_request_keys:
             kw[key] = REQUEST[key]
 
     def getNewKeyAndUpdateVariables(key):
-      key_is_acceptable = key in acceptable_keys # Only calculate once
+      key_is_acceptable = key in acceptable_key_map # Only calculate once
       key_is_related = key in related_keys
       new_key = None
       if key_is_acceptable or key_is_related:
@@ -2068,7 +2067,7 @@
               new_key = '%s.%s' % (acceptable_key_map[key][0], key)
             # query_table specifies what table name should be used by default
             elif query_table and \
-                '%s.%s' % (query_table, key) in acceptable_keys:
+                '%s.%s' % (query_table, key) in acceptable_key_map:
               new_key = '%s.%s' % (query_table, key)
             elif key == 'uid':
               # uid is always ambiguous so we can only change it here