Index: openacs-4/packages/assessment/www/admin/item-add-mc-choices.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-mc-choices.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/item-add-mc-choices.tcl	29 Dec 2004 09:07:39 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/item-add-mc-choices.tcl	7 Jan 2005 16:10:45 -0000	1.4
@@ -11,6 +11,8 @@
     mc_id:integer
     display_type
     feedback:array,optional
+    fixed_pos:array,optional
+    answer_val:array,optional
     percent:array,optional
     selected:array,optional
 } -properties {
@@ -28,12 +30,13 @@
     ad_script_abort
 }
 
+set package_id [ad_conn package_id]
 set page_title [_ assessment.add_item_type_mc_choices]
 set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title]
 
 set selected_options [list [list "[_ assessment.yes]" t]]
 
-ad_form -name item_add_mc_choices -action item-add-mc-choices -export { assessment_id section_id after mc_id display_type } -form {
+ad_form -name item_add_mc_choices -action item-add-mc-choices -export { assessment_id section_id after mc_id display_type } -html {enctype multipart/form-data} -form {
     {as_item_id:key}
 }
 
@@ -47,6 +50,9 @@
 	append ad_form_code "\{infotxt.$choice_id:text(inform) \{label \"[_ assessment.Choice]\"\} \{value \"$title <img src=../graphics/wrong.gif>\"\}\}\n"
     }
     append ad_form_code "\{selected.$choice_id:text(checkbox),optional \{label \"[_ assessment.Default_Selected]\"\} \{options \$selected_options\} \{help_text \"[_ assessment.Default_Selected_help]\"\}\}\n"
+    append ad_form_code "\{fixed_pos.$choice_id:text,optional \{label \"[_ assessment.Fixed_Position]\"\} \{html \{size 5 maxlength 5\}\} \{help_text \"[_ assessment.choice_Fixed_Position_help]\"\}\}\n"
+    append ad_form_code "\{answer_val.$choice_id:text,optional \{label \"[_ assessment.Answer_Value]\"\} \{html \{size 80 maxlength 500\}\} \{help_text \"[_ assessment.Answer_Value_help]\"\}\}\n"
+    append ad_form_code "\{content_$choice_id:file,optional \{label \"[_ assessment.choice_Content]\"\} \{help_text \"[_ assessment.choice_Content_help]\"\}\}\n"
     append ad_form_code "\{feedback.$choice_id:text(textarea),optional \{label \"[_ assessment.Feedback]\"\} \{html \{rows 8 cols 80\}\} \{help_text \"[_ assessment.choice_Feedback_help]\"\}\}\n"
     if {$correct_answer_p == "t"} {
 	set default_percent "\$percentage"
@@ -63,12 +69,40 @@
 
 ad_form -extend -name item_add_mc_choices -edit_request {
 } -edit_data {
+    set max_file_size 10000000
+    # [ad_parameter MaxAttachmentSize]
+    set pretty_max_size [util_commify_number $max_file_size]
+    set folder_id [as::assessment::folder_id -package_id $package_id]
+
     db_transaction {
 	set count 0
 	foreach choice_id [array names feedback] {
 	    set feedback_text $feedback($choice_id)
 	    set selected_p [ad_decode [info exists selected($choice_id)] 0 f t]
 	    set percent_score $percent($choice_id)
+	    set fixed_position $fixed_pos($choice_id)
+	    set answer_value $answer_val($choice_id)
+
+	    eval set content "\$content_$choice_id"
+	    if {![empty_string_p $content]} {
+		set filename [lindex $content 0]
+		set tmp_filename [lindex $content 1]
+		set file_mimetype [lindex $content 2]
+		set n_bytes [file size $tmp_filename]
+
+		if { $n_bytes > $max_file_size && $max_file_size > 0 } {
+		    ad_return_complaint 1 "[_ assessment.file_too_large]"
+		    return
+		}
+		if { $n_bytes == 0 } {
+		    ad_return_complaint 1 "[_ assessment.file_zero_size]"
+		    return
+		}
+		set content_rev_id [cr_import_content -package_id $package_id -title $filename $folder_id $tmp_filename $n_bytes $file_mimetype [exec uuidgen]]
+	    } else {
+		set content_rev_id ""
+	    }
+
 	    db_dml update_choice_data {}
 	}
     }