Index: openacs-4/packages/assessment/www/assessment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.tcl,v diff -u -r1.47.2.3 -r1.47.2.4 --- openacs-4/packages/assessment/www/assessment.tcl 27 Jun 2005 14:50:16 -0000 1.47.2.3 +++ openacs-4/packages/assessment/www/assessment.tcl 4 Jul 2005 15:02:24 -0000 1.47.2.4 @@ -15,6 +15,7 @@ {return_url:optional} response_to_item:array,optional,multiple,html {next_asm:optional} + {response:multiple,optional} } -properties { context:onevalue page_title:onevalue @@ -312,6 +313,7 @@ # save answer set response_item_id \$item_id + db_1row process_item_type {} set item_type \[string range \$item_type end-1 end\] if {!\[info exists response_to_item(\$response_item_id)\]} { @@ -325,7 +327,14 @@ } set points \[ad_decode \$points \"\" 0 \$points\] - as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response_to_item(\$response_item_id) -max_points \$points -allow_overwrite_p \$display(back_button_p) + + set response \$response_to_item(\$response_item_id) + + if { \$item_type == \"fu\" } { + set response \[list \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile) \$response_to_item(\${response_item_id}.content-type)\] + } + + as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) } }" set after_submit "{ @@ -391,7 +400,13 @@ } set points \[ad_decode \$points \"\" 0 \$points\] - as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response_to_item(\$response_item_id) -max_points \$points -allow_overwrite_p \$display(back_button_p) + set response \$response_to_item(\$response_item_id) + + if { \$item_type == \"fu\" } { + set response \[list \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile) \$response_to_item(\${response_item_id}.content-type)\] + } + + as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) } if {\$section_order != \$new_section_order} { @@ -451,7 +466,14 @@ set item_type [string range $item_type end-1 end] set points [ad_decode $points "" 0 $points] - as::item_type_$item_type\::process -type_id $item_type_id -session_id $session_id -as_item_id $response_item_id -section_id $section_id -subject_id $user_id -response "" -max_points $points -allow_overwrite_p $display(back_button_p) + set response \$response_to_item(\$response_item_id)\ + + if { \$item_type == \"fu\" } { + set response \[list \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile) \$response_to_item(\${response_item_id}.content-type)\] + } + + as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) + } if {$section_order != $new_section_order} {