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.1 -r1.2
--- openacs-4/packages/imsld/tcl/imsld-roles-procs.xql	30 Mar 2006 15:49:45 -0000	1.1
+++ openacs-4/packages/imsld/tcl/imsld-roles-procs.xql	18 May 2006 11:13:00 -0000	1.2
@@ -116,9 +116,24 @@
 		</querytext>
 	</fullquery>
 
+    <fullquery name="imsld::roles::get_role_instances.get_community_related_groups">
+		<querytext>
+        select ar.object_id_two
+        from acs_rels ar,
+             acs_rels ar2,
+             imsld_rolesi iri
+        where ar.object_id_one=iri.item_id
+              and ar.rel_type='imsld_role_group_rel'
+              and ar.object_id_two=ar2.object_id_one
+              and ar2.rel_type='imsld_roleinstance_club_rel'
+              and ar2.object_id_two=:community_id
+              and iri.role_id=:role_id
+		</querytext>
+	</fullquery>
+
 	<fullquery name="imsld::roles::get_role_instances.get_related_groups">
 		<querytext>
-        select ar.object_id_two as groups
+        select ar.object_id_two
         from acs_rels ar,
              imsld_rolesi iri
         where ar.object_id_one=iri.item_id
@@ -133,13 +148,69 @@
         from imsld_rolesi iri,
              imsld_rolesi iri1 
         where iri1.parent_role_id=iri.item_id 
-              and iri1.role_id=:role_id
+              and iri1.role_id=:role
         </querytext>
 	</fullquery>
 
 
+	<fullquery name="imsld::roles::get_parent_role_instance.get_parent_role_instance">
+		<querytext>
+        select object_id_one as parent_group_id
+        from acs_rels 
+        where object_id_two=:group_id
+              and rel_type='composition_rel'
+        </querytext>
+	</fullquery>
 
+	<fullquery name="imsld::roles::get_user_roles.get_user_roles_list">
+		<querytext>
+        select ir.role_id 
+        from imsld_rolesi ir,
+             group_member_map gmm, 
+             acs_objects ao,
+             acs_rels ar 
+        where ao.object_id = gmm.group_id 
+              and ao.object_type = 'imsld_role_group' 
+              and ar.object_id_two = gmm.group_id 
+              and ir.item_id = ar.object_id_one
+              and gmm.member_id = :user_id
+        </querytext>
+	</fullquery>
 
+	<fullquery name="imsld::roles::get_imsld_from_role.get_imsld">
+		<querytext>
+        select iii.imsld_id
+        from imsld_imsldsi iii,
+             imsld_roles ir,
+             imsld_componentsi ici
+        where iii.item_id = ici.imsld_id
+              and ici.item_id = ir.component_id
+              and ir.role_id = :role_id
+        </querytext>
+	</fullquery>
 
+
+	<fullquery name="imsld::roles::get_role_instances.get_list_of_groups">
+		<querytext>
+        select ar1.object_id_two as group 
+        from imsld_rolesi iri, 
+             acs_rels ar1 
+        where ar1.rel_type='imsld_role_group_rel' 
+              and ar1.object_id_one=iri.item_id 
+              and iri.role_id=:role_id 
+        </querytext>
+	</fullquery>
+
+	<fullquery name="imsld::roles::get_role_instances.get_list_of_community_groups">
+		<querytext>
+        select object_id_one 
+        from acs_rels 
+        where rel_type='imsld_roleinstance_club_rel' 
+              and object_id_one in ([join $groups_list ","])
+              and object_id_two = :community_id
+        </querytext>
+	</fullquery>
+
+    
 </queryset>