Index: openacs-4/packages/assessment/tcl/as-section-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-procs-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/tcl/as-section-procs-oracle.xql	21 Feb 2005 14:32:56 -0000	1.5
+++ openacs-4/packages/assessment/tcl/as-section-procs-oracle.xql	11 Mar 2005 18:54:12 -0000	1.6
@@ -7,9 +7,11 @@
 
 	select s.as_item_id, ci.name, r.title, r.description, i.subtext, m.required_p,
 	       m.max_time_to_complete, r2.revision_id as content_rev_id,
-	       r2.title as content_filename, ci2.content_type
+	       r2.title as content_filename, ci2.content_type,
+	       ir.target_rev_id as as_item_type_id
 	from as_session_items s, as_items i, as_item_section_map m, cr_revisions r,
-	     cr_items ci, as_item_rels ar, cr_revisions r2, cr_items ci2
+	     cr_items ci, as_item_rels ar, cr_revisions r2, cr_items ci2,
+	     as_item_rels ir
 	where ar.item_rev_id(+) = s.as_item_id
 	and ar.rel_type(+) = 'as_item_content_rel'
 	and ar.target_rev_id = r2.revision_id(+)
@@ -21,6 +23,8 @@
 	and ci.item_id = r.item_id
 	and m.as_item_id = s.as_item_id
 	and m.section_id = s.section_id
+	and ir.item_rev_id = s.as_item_id
+	and ir.rel_type = 'as_item_type_rel'
 	order by s.sort_order
 
 	</querytext>
@@ -31,9 +35,10 @@
 
 	select i.as_item_id, ci.name, cr.title, cr.description, i.subtext,
 	       m.required_p, m.max_time_to_complete, r2.revision_id as content_rev_id,
-	       r2.title as content_filename, ci2.content_type, m.fixed_position
+	       r2.title as content_filename, ci2.content_type, m.fixed_position,
+	       ir.target_rev_id as as_item_type_id
 	from as_item_section_map m, as_items i, cr_revisions cr, cr_items ci,
-	     as_item_rels ar, cr_revisions r2, cr_items ci2
+	     as_item_rels ar, cr_revisions r2, cr_items ci2, as_item_rels ir
 	where ar.item_rev_id (+) = i.as_item_id
 	and ar.rel_type (+) = 'as_item_content_rel'
 	and ar.target_rev_id = r2.revision_id (+)
@@ -42,6 +47,8 @@
 	and i.as_item_id = m.as_item_id
 	and m.section_id = :section_id
 	and ci.item_id = cr.item_id
+	and ir.item_rev_id = i.as_item_id
+	and ir.rel_type = 'as_item_type_rel'
 	order by m.sort_order
 
 	</querytext>