Provide in-catalog explicit priority for (local) role columns names.

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


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44644 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ZSQLCatalog/SQLCatalog.py

@@ -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):
     """