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

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Mar 25 19:26:23 2011
New Revision: 44644

URL: http://svn.erp5.org?rev=44644&view=rev
Log:
Provide in-catalog explicit priority for (local) role columns names.

This is usefull when automated configuration appends configurations: latest
takes precedence.

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=44644&r1=44643&r2=44644&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Fri Mar 25 19:26:23 2011
@@ -621,15 +621,21 @@ class Catalog(Folder,
     """
     Return the list of role keys.
     """
-    return [tuple([y.strip() for y in x.split('|')]) \
-              for x in self.sql_catalog_role_keys]
+    role_key_dict = {}
+    for role_key in self.sql_catalog_role_keys:
+      role, column = role_key.split('|')
+      role_key_dict[role.strip()] = column.strip()
+    return role_key_dict.items()
 
   def getSQLCatalogLocalRoleKeysList(self):
     """
     Return the list of local role keys.
     """
-    return [tuple([y.strip() for y in x.split('|')]) \
-              for x in self.sql_catalog_local_role_keys]
+    local_role_key_dict = {}
+    for role_key in self.sql_catalog_local_role_keys:
+      role, column = role_key.split('|')
+      local_role_key_dict[role.strip()] = column.strip()
+    return role_key_dict.items()
 
   def manage_exportProperties(self, REQUEST=None, RESPONSE=None):
     """