Index: openacs-4/packages/assessment/tcl/as-item-form-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-form-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/tcl/as-item-form-procs.xql	27 Oct 2004 13:51:09 -0000	1.2
+++ openacs-4/packages/assessment/tcl/as-item-form-procs.xql	10 Dec 2004 11:42:23 -0000	1.3
@@ -3,39 +3,31 @@
 
 <fullquery name="as::item_form::add_item_to_form.item_choices_2">
 	<querytext>
-		select
-		as_item_choicesx.choice_id, as_item_choicesx.title, as_item_choicesx.content_value
-		from
-		as_item_choicesx
-		where
-		as_item_choicesx.mc_id=:mc_id
-		order by
-		as_item_choicesx.sort_order
+		select i.choice_id, cr.title, i.content_value
+		from as_item_choices i, cr_revisions cr
+		where i.mc_id = :mc_id
+		and cr.revision_id = i.choice_id
+		order by i.sort_order
 	</querytext>
 </fullquery>
 
 <fullquery name="as::item_form::add_item_to_form.item_choices_3">
 	<querytext>
-		select
-		as_item_choicesx.choice_id, as_item_choicesx.title
-		from
-		as_item_choicesx
-		where
-		as_item_choicesx.mc_id=:mc_id
-		order by
-		as_item_choicesx.sort_order
+		select i.choice_id, cr.title
+		from as_item_choices i, cr_revisions cr
+		where i.mc_id = :mc_id
+		and cr.revision_id = i.choice_id
+		order by i.sort_order
 	</querytext>
 </fullquery>
 
 <fullquery name="as::item_form::add_item_to_form.item_properties">
 	<querytext>
-		select
-		as_itemsx.title, as_itemsx.required_p
-		from
-		as_itemsx
-		where
-		as_itemsx.as_item_id=:item_id
+		select cr.title, i.required_p
+		from as_items i, cr_revisions cr
+		where i.as_item_id = :item_id
+		and cr.revision_id = i.as_item_id
 	</querytext>
 </fullquery>
-</queryset>
 
+</queryset>