Index: openacs-4/packages/imsld/tcl/imsld-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/imsld/tcl/imsld-procs.xql	6 Feb 2006 17:07:44 -0000	1.6
+++ openacs-4/packages/imsld/tcl/imsld-procs.xql	6 Feb 2006 18:12:50 -0000	1.7
@@ -225,14 +225,34 @@
         then 'structure'
         else 'none'
         end as type,
-        content_item__get_live_revision(coalesce(learning_activity_id,support_activity_id,activity_structure_id)) as activity_id
+        content_item__get_live_revision(coalesce(learning_activity_id,support_activity_id,activity_structure_id)) as activity_id,
+        coalesce(learning_activity_id, support_activity_id, activity_structure_id) as activity_item_id
         from imsld_role_parts
         where role_part_id = :role_part_id
-    
+
 		</querytext>
 	</fullquery>
 
+	<fullquery name="imsld::mark_role_part_finished.get_object_from_resource">
+		<querytext>
+        select acs_object_id as the_object_id
+        from imsld_cp_resourcesi
+        where item_id = :the_resource_id and 
+              acs_object_id is not null
 
+		</querytext>
+	</fullquery>
+
+	<fullquery name="imsld::mark_role_part_finished.get_cr_item_from_resource">
+		<querytext>
+            select ar.object_id_two as the_object_id
+            from acs_rels ar 
+            where ar.object_id_one=:the_resource_id and
+                  ar.rel_type='imsld_res_files_rel'
+		</querytext>
+	</fullquery>
+
+
 	<fullquery name="imsld::mark_act_finished.act_info">
 		<querytext>
         select item_id as act_item_id