Index: openacs-4/packages/assessment/lib/section-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/assessment/lib/section-items.tcl	13 Apr 2005 10:48:29 -0000	1.8
+++ openacs-4/packages/assessment/lib/section-items.tcl	13 Apr 2005 18:51:54 -0000	1.9
@@ -2,19 +2,23 @@
     {section_id:text(hidden) {value $section_id}}
 }
 
-db_multirow -extend { checks_related presentation_type html mc_type choice_orientation } items section_items {} {
+db_multirow -extend { checks_related presentation_type html item_type choice_orientation } items section_items {} {
     set presentation_type [as::item_form::add_item_to_form -name admin_section -section_id $section_id -item_id $as_item_id -random_p f]
     if {$presentation_type == "fitb"} {
         regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html
     }
+    array set item [as::item::item_data -as_item_id $as_item_id]
+
     if {$presentation_type == "rb" || $presentation_type == "cb"} {
-	set choice_orientation [as::item::get_choice_orientation -as_item_id $as_item_id -presentation_type $presentation_type]
+	array set type [as::item_display_$presentation_type\::data -type_id $item(display_type_id)]
+	set choice_orientation $type(choice_orientation)
+	array unset type
     } else {
 	set choice_orientation ""
     }
 
-    #used to determine if the item is multiple choice
-    set mc_type [as::item::mc_type -as_item_id $as_item_id]
+    set item_type $item(item_type)
+    array unset item
 
     if {[empty_string_p $points]} {
 	set points 0