Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl	22 Dec 2004 20:52:17 -0000	1.8
+++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl	24 Dec 2004 15:32:38 -0000	1.9
@@ -134,7 +134,6 @@
     -type_id:required
     -section_id:required
     -as_item_id:required
-    -default_provided:boolean
     {-default_value ""}
     {-session_id ""}
 } {
@@ -143,6 +142,19 @@
 
     Render a Multiple Choice Type
 } {
+    if {![empty_string_p $default_value]} {
+	array set values $default_value
+	set defaults $values(choice_answer)
+    }
+
+    if {![empty_string_p $session_id]} {
+	set choice_list [db_list_of_lists get_sorted_choices {}]
+	
+	if {[llength $choice_list] > 0} {
+	    return [list $defaults $choice_list]
+	}
+    }
+
     db_1row item_type_data {}
 
     set defaults ""
@@ -163,18 +175,6 @@
 	}
     }
 
-    if {$default_provided_p} {
-	set defaults $default_value
-    }
-
-    if {![empty_string_p $session_id]} {
-	set choice_list [db_list get_sorted_choices {}]
-	
-	if {[llength $choice_list] > 0} {
-	    return [list $defaults $choice_list]
-	}
-    }
-
     if {![empty_string_p $num_answers] && $num_answers < $total} {
 	# display fewer choices, select random
 	set correct_choices [util::randomize_list $correct_choices]