Index: openacs-4/packages/assessment/tcl/as-item-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-form-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/assessment/tcl/as-item-form-procs.tcl	5 Dec 2004 17:17:12 -0000	1.7
+++ openacs-4/packages/assessment/tcl/as-item-form-procs.tcl	8 Dec 2004 15:30:34 -0000	1.8
@@ -6,21 +6,25 @@
 
 namespace eval as::item_form {}
 
-ad_proc -public as::item_form::add_item_to_form  { form item_id } { Add items to a form. The form values are stored in response_to_item.item_id } {
+ad_proc -public as::item_form::add_item_to_form  {
+    form
+    item_id
+} {
+    Add items to a form. The form values are stored in response_to_item.item_id
+} {
     set element_name "response_to_item.$item_id"
     db_1row item_properties ""
     set user_value ""
 
-    set item_item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:item_id"]
-    set item_display_id [db_string item_item_type "SELECT related_object_id FROM cr_item_rels WHERE relation_tag = 'as_item_display_rel' AND item_id=:item_item_id"]
-    db_0or1row as_item_display_rbx "SELECT item_id AS as_item_display_rbx__item_id FROM as_item_display_rbx WHERE item_id=:item_display_id"
-    db_0or1row as_item_display_tbx "SELECT item_id AS as_item_display_tbx__item_id FROM as_item_display_tbx WHERE item_id=:item_display_id"
-    db_0or1row as_item_display_tax "SELECT item_id AS as_item_display_tax__item_id FROM as_item_display_tax WHERE item_id=:item_display_id"
+    set item_display_id [as::item_rels::get_target -item_rev_id $item_id -type as_item_display_rel]
+    db_0or1row as_item_display_rbx "SELECT as_item_display_id AS rb__display_id FROM as_item_display_rb WHERE as_item_display_id=:item_display_id"
+    db_0or1row as_item_display_tbx "SELECT as_item_display_id AS tb__display_id FROM as_item_display_tbx WHERE as_item_display_id=:item_display_id"
+    db_0or1row as_item_display_tax "SELECT as_item_display_id AS ta__display_id FROM as_item_display_tax WHERE as_item_display_id=:item_display_id"
     set presentation_type "checkbox" ;# DEFAULT
     #get the presentation type
-    if {[info exists as_item_display_rbx__item_id]} {set presentation_type "radio"}
-    if {[info exists as_item_display_tbx__item_id]} {set presentation_type "fitb"}
-    if {[info exists as_item_display_tax__item_id]} {set presentation_type "textarea"}
+    if {[info exists rb__display_id]} {set presentation_type "radio"}
+    if {[info exists tb__display_id]} {set presentation_type "fitb"}
+    if {[info exists ta__display_id]} {set presentation_type "textarea"}
 
     #Add the items depending on the presentation type (as_item_display_types)
     switch -- $presentation_type {
@@ -35,7 +39,7 @@
 	}
 
 	"textarea" {
-	    db_0or1row html_rows_cols "SELECT html_display_options FROM as_item_display_tax WHERE item_id=:item_display_id"	   
+	    db_0or1row html_rows_cols "SELECT html_display_options FROM as_item_display_ta WHERE as_item_display_id=:item_display_id"	   
 	    template::element::create $form $element_name \
 		-datatype text \
 		-widget textarea \
@@ -48,10 +52,7 @@
 
 	"radio" {
 	    set widget "text(radio)"
-	    set item_item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:item_id"]
-	    set item_mc_id [db_string item_item_type "SELECT related_object_id FROM cr_item_rels WHERE relation_tag = 'as_item_type_rel' AND item_id=:item_item_id"]
-	    set mc_id [db_string item_to_rev "SELECT latest_revision FROM cr_items WHERE item_id=:item_mc_id"]
-	    ## set mc_id [db_string item_to_rev "SELECT revision_id FROM cr_revisions WHERE item_id=:item_mc_id"]
+	    set mc_id [as::item_rels::get_target -item_rev_id $item_id -type as_item_type_rel]
 	    set optionlist [list]
 	    db_foreach item_choices_2 "" {
 	        #for multiple choice item with multimedia
@@ -74,10 +75,7 @@
 	}
 
 	"checkbox" {
-	    set item_item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:item_id"]
-	    set item_mc_id [db_string item_item_type "SELECT related_object_id FROM cr_item_rels WHERE relation_tag = 'as_item_type_rel' AND item_id=:item_item_id"]
-	    set mc_id [db_string item_to_rev "SELECT latest_revision FROM cr_items WHERE item_id=:item_mc_id"]
-	    ## set mc_id [db_string item_to_rev "SELECT revision_id FROM cr_revisions WHERE item_id=:item_mc_id"]
+	    set mc_id [as::item_rels::get_target -item_rev_id $item_id -type as_item_type_rel]
 	    set choices [list]
 	    set optionlist [list]
 	    db_foreach item_choices_2 "" {