Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/tcl/as-item-type-mc-procs-postgresql.xql	7 Oct 2007 22:36:54 -0000	1.4
+++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs-postgresql.xql	2 Sep 2008 17:21:29 -0000	1.5
@@ -5,11 +5,8 @@
 <fullquery name="as::item_type_mc::render.get_sorted_choices">
       <querytext>
 
-	select r.title, c.choice_id, r2.revision_id as content_rev_id,
-	       r2.title as content_filename, i.content_type
+	select r.title, c.choice_id, c.content_value
 	from as_session_choices sc, cr_revisions r, as_item_choices c
-	left outer join cr_revisions r2 on (r2.revision_id = c.content_value)
-	left outer join cr_items i on (i.item_id = r2.item_id)
 	where sc.session_id = :session_id
 	and sc.section_id = :section_id
 	and sc.as_item_id = :as_item_id
@@ -23,12 +20,8 @@
 <fullquery name="as::item_type_mc::render.get_sorted_choices_with_feedback">
       <querytext>
 
-	select r.title, c.choice_id, c.correct_answer_p, c.feedback_text,
-	       r2.revision_id as content_rev_id, r2.title as content_filename,
-	       i.content_type
+	select r.title, c.choice_id, c.correct_answer_p, c.feedback_text, c.content_value
 	from as_session_choices sc, cr_revisions r, as_item_choices c
-	left outer join cr_revisions r2 on (r2.revision_id = c.content_value)
-	left outer join cr_items i on (i.item_id = r2.item_id)
 	where sc.session_id = :session_id
 	and sc.section_id = :section_id
 	and sc.as_item_id = :as_item_id
@@ -42,12 +35,8 @@
 <fullquery name="as::item_type_mc::render.choices">
       <querytext>
 
-	select c.choice_id, r.title, c.correct_answer_p, c.selected_p, c.fixed_position,  c.feedback_text,
-	       r2.revision_id as content_rev_id, r2.title as content_filename,
-	       i.content_type
+	select c.choice_id, r.title, c.correct_answer_p, c.selected_p, c.fixed_position,  c.feedback_text, c.content_value
 	from cr_revisions r, as_item_choices c
-	left outer join cr_revisions r2 on (r2.revision_id = c.content_value)
-	left outer join cr_items i on (i.item_id = r2.item_id)
 	where c.mc_id = :type_id
 	and r.revision_id = c.choice_id
 	order by c.sort_order