Index: openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl	13 Jul 2006 13:11:43 -0000	1.11
+++ openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl	21 Jul 2006 13:13:42 -0000	1.12
@@ -21,9 +21,11 @@
     @param role_id identifier of the role to be instanciated
 } {
     db_1row get_role_name {} 
-    set role_name [join [list imsld $role_type $role_id] "_"]
-    set names_counter [db_string name_already_exist {}]
-    set role_name [join [list $role_name $names_counter] "_"]
+
+    set role_name [join [list $role_name] "_"]
+    set existing_instances [db_string existing_instances {} -default ${role_name}_0]
+    regexp {(.*)_(.*)} $existing_instances role_name_temp prefix names_counter
+    set role_name [join [list $role_name [expr $names_counter +1 ]] "_"]
     set user_id [ad_conn user_id] 
     set peeraddr [ad_conn peeraddr]
 
@@ -122,7 +124,7 @@
     foreach role_item_par $roles_list {
 
         set role_item [lindex $role_item_par 0]
-        set depth [lindex $role_item_par 1]       
+        set depth [lindex $role_item_par 1]
 
         db_1row get_role_name {}
         if {![string eq "" $name]} {
@@ -322,24 +324,36 @@
 
 ad_proc -public imsld::roles::get_role_id {
     -ref:required
-    -run_id:required
+    -run_id
+    -imsld_id
 } {
-    Returns the role_id which has a given ref in a run, 0 if no matches found.
+    Returns the role_id which has a given ref in a run or imsld, 0 if no matches found.
 } {
-    if { [db_0or1row select_role_id {
-        select ar1.object_id_one as role_id
-        from imsld_rolesi iri, 
-             acs_rels ar1, 
-             acs_rels ar2 
-        where ar1.object_id_two=ar2.object_id_one 
-              and ar1.rel_type='imsld_role_group_rel' 
-              and ar2.rel_type='imsld_roleinstance_run_rel' 
-              and ar2.object_id_two=:run_id
-              and iri.item_id=ar1.object_id_one 
-              and iri.identifier=:ref
-        group by ar1.object_id_one;
-    }] } {
-        return $role_id
+    if {[info exist imsld_id]} {
+        if { [db_0or1row select_role_id_from_imsld {
+            select role_id 
+            from imsld_roles ir, 
+                 imsld_componentsi ici 
+            where ir.identifier=:ref 
+                  and ir.component_id=ici.item_id 
+                  and ici.imsld_id=:imsld_id
+        }]}  
+    } elseif { [info exist run_id] } {
+        if { [db_0or1row select_role_id_from_run {
+                select ar1.object_id_one as role_id
+                from imsld_rolesi iri, 
+                     acs_rels ar1, 
+                     acs_rels ar2 
+                where ar1.object_id_two=ar2.object_id_one 
+                      and ar1.rel_type='imsld_role_group_rel' 
+                      and ar2.rel_type='imsld_roleinstance_run_rel' 
+                      and ar2.object_id_two=:run_id
+                      and iri.item_id=ar1.object_id_one 
+                      and iri.identifier=:ref
+                group by ar1.object_id_one;v
+            }] } {
+            return $role_id
+        }
     } else {
         return 0
     }
Index: openacs-4/packages/imsld/tcl/imsld-roles-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-roles-procs.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld/tcl/imsld-roles-procs.xql	19 May 2006 17:26:02 -0000	1.3
+++ openacs-4/packages/imsld/tcl/imsld-roles-procs.xql	21 Jul 2006 13:13:42 -0000	1.4
@@ -11,7 +11,7 @@
 
 <fullquery name="imsld::roles::create_instance.get_role_name">
 		<querytext>
-        select role_type,item_id as role_item_id  
+        select coalesce(title,role_type) as role_name,item_id as role_item_id  
         from imsld_rolesi 
         where role_id=:role_id
 		</querytext>
@@ -52,11 +52,23 @@
       </querytext>
 </fullquery>
 
-<fullquery name="imsld::roles::create_instance.name_already_exist">      
+<fullquery name="imsld::roles::create_instance.existing_instances">      
       <querytext>
-        select count(*) as names_counter
-        from groups
-        where group_name like (:role_name || '%')
+        select gr.group_name 
+        from groups gr, 
+            acs_rels ar1, 
+            acs_rels ar2, 
+            imsld_run_users_group_ext iruge, 
+            imsld_rolesi iri 
+        where ar1.rel_type='imsld_roleinstance_run_rel' 
+            and ar1.object_id_one=gr.group_id 
+            and ar1.object_id_two=iruge.group_id 
+            and iruge.run_id=:run_id
+            and iri.role_id=:role_id
+            and iri.item_id=ar2.object_id_one 
+            and ar2.rel_type='imsld_role_group_rel' 
+            and ar2.object_id_two=gr.group_id
+        order by gr.group_name desc limit 1 
       </querytext>
 </fullquery>
 
@@ -93,10 +105,12 @@
 
  <fullquery name="imsld::roles::get_depth.has_parent">      
       <querytext>
-        select parent_role_id 
-        from imsld_roles
-        where role_id=:role_id
-              and parent_role_id > 0
+        select ir2.role_id as parent_role_id 
+        from imsld_roles ir,
+             imsld_rolesi ir2  
+        where ir.role_id=:role_id
+              and ir.parent_role_id > 0 
+              and ir.parent_role_id=ir2.item_id
       </querytext>
 </fullquery>