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.3 -r1.4
--- openacs-4/packages/assessment/tcl/as-item-form-procs.xql	10 Dec 2004 11:42:23 -0000	1.3
+++ openacs-4/packages/assessment/tcl/as-item-form-procs.xql	10 Dec 2004 20:21:50 -0000	1.4
@@ -1,32 +1,21 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="as::item_form::add_item_to_form.item_choices_2">
-	<querytext>
-		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 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 cr.title, i.required_p
-		from as_items i, cr_revisions cr
+		select cr.title, i.subtext, i.data_type, i.required_p,
+		       oi.object_id as item_type_id, oi.object_type as item_type,
+		       od.object_id as display_type_id, od.object_type as display_type
+		from as_items i, cr_revisions cr, as_item_rels it,
+		     as_item_rels dt, acs_objects oi, acs_objects od
 		where i.as_item_id = :item_id
 		and cr.revision_id = i.as_item_id
+		and it.item_rev_id = i.as_item_id
+		and dt.item_rev_id = i.as_item_id
+		and it.rel_type = 'as_item_type_rel'
+		and dt.rel_type = 'as_item_display_rel'
+		and oi.object_id = it.target_rev_id
+		and od.object_id = dt.target_rev_id
 	</querytext>
 </fullquery>