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

[nobody at svn.erp5.org]

Author: yusei
Date: Sun Mar  1 08:42:17 2009
New Revision: 25752

URL: http://svn.erp5.org?rev=25752&view=rev
Log:
Support scriptable 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=25752&r1=25751&r2=25752&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Sun Mar  1 08:42:17 2009
@@ -1854,12 +1854,15 @@
     else:
       # Maybe a related key...
       related_key_definition = self.getRelatedKeyDefinition(key)
-      if related_key_definition is None:
+      if related_key_definition is not None:
+        # It's a related key
+        search_key = self.getSearchKey(key, 'RelatedKey')
+      elif self.getScriptableKeyScript(key) is not None:
+        # It's a scriptable key
+        search_key = self.getSearchKey(key, 'RawKey')
+      else:
         # Unknown
         search_key = None
-      else:
-        # It's a related key
-        search_key = self.getSearchKey(key, 'RelatedKey')
     return search_key, related_key_definition
 
   @profiler_decorator