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 -r1.47.2.1
--- openacs-4/packages/assessment/www/assessment.tcl	9 May 2005 21:58:24 -0000	1.47
+++ openacs-4/packages/assessment/www/assessment.tcl	31 May 2005 23:13:01 -0000	1.47.2.1
@@ -14,29 +14,26 @@
     {item_id ""}
     {return_url:optional}
     response_to_item:array,optional,multiple,html
-    {next_asm:optional}
 } -properties {
-    context:onevalue
+    context_bar:onevalue
     page_title:onevalue
 }
 
 set user_id [ad_conn user_id]
 set page_title "[_ assessment.Show_Items]"
-set context [list $page_title]
+set context_bar [ad_context_bar $page_title]
 set section_to ""
 set item_to ""
 set url ""
 
 if { [info exists return_url] } {
-    
     set url $return_url
     ns_log notice "$return_url"
 } 
 
 set return_url "$url"
 
 
-
 # Get the assessment data
 as::assessment::data -assessment_id $assessment_id
 permission::require_permission -object_id $assessment_id -privilege read
@@ -65,13 +62,13 @@
 		# set the time when the subject initiated the Assessment
 		db_dml session_start {}
 	    } else {
-		set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url next_asm}]
+		set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url}]
 	    }
 	} else {
 	    # pick up old session
 	    db_1row unfinished_section_order {}
 	    if {[empty_string_p $section_order]} {
-		set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url next_asm}]
+		set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url}]
 	    } else {
 		db_1row unfinished_section_id {}
 		db_1row unfinished_item_order {}
@@ -230,7 +227,7 @@
 	# go to next section
 	set section_order $new_section_order
 	set item_order $new_item_order
-	ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm}]
+	ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url}]
 	ad_script_abort
     } else {
 	# calculate session points at end of session
@@ -239,7 +236,7 @@
 	as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id
         as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id
 	if {[empty_string_p $assessment_data(return_url)]} {
-	    ad_returnredirect [export_vars -base finish {session_id assessment_id return_url next_asm}]
+	    ad_returnredirect [export_vars -base finish {session_id assessment_id return_url}]
 	} else {
 	    ad_returnredirect $assessment_data(return_url)
 	}
@@ -249,7 +246,7 @@
 
 
 # form for display an assessment with sections and items
-ad_form -name show_item_form -action assessment -html {enctype multipart/form-data} -export { next_asm assessment_id section_id section_order item_order password return_url} -form {
+ad_form -name show_item_form -action assessment -html {enctype multipart/form-data} -export {assessment_id section_id section_order item_order password return_url} -form {
     {session_id:text(hidden) {value $session_id}}
 }
 
@@ -298,7 +295,7 @@
 	}
 	
 	# create seperate submit form for each item
-	ad_form -name show_item_form_$as_item_id -mode $mode -action assessment -html {enctype multipart/form-data} -export {assessment_id section_id section_order item_order password return_url next_asm} -form {
+	ad_form -name show_item_form_$as_item_id -mode $mode -action assessment -html {enctype multipart/form-data} -export {assessment_id section_id section_order item_order password return_url} -form {
 	    {session_id:text(hidden) {value $session_id}}
 	    {item_id:text(hidden) {value $as_item_id}}
 	}
@@ -312,7 +309,7 @@
 		# save answer
 		set response_item_id \$item_id
 		db_1row process_item_type {}
-		set item_type \[string range \$item_type end-1 end\]
+		set item_type \[lindex \[split \$item_type \"_\"\] end\]
 		if {!\[info exists response_to_item(\$response_item_id)\]} {
 		    set response_to_item(\$response_item_id) \"\"
 		} else {
@@ -328,7 +325,7 @@
 	    }
 	}"
 	set after_submit "{
-	    ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm}\]
+	    ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url}\]
 	    ad_script_abort
 	}"
 	
@@ -377,7 +374,7 @@
 	    foreach one_response \$item_list {
 		util_unlist \$one_response response_item_id
 		db_1row process_item_type {}
-		set item_type \[string range \$item_type end-1 end\]
+		set item_type \[lindex \[split \$item_type \"_\"\] end\]
 		if {!\[info exists response_to_item(\$response_item_id)\]} {
 		    set response_to_item(\$response_item_id) \"\"
 		} else {
@@ -419,7 +416,7 @@
             }
 	    set item_order \$new_item_order
 
-	    ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm}\]
+	    ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url}\]
 	    ad_script_abort
 	} else {
 	    # calculate session points at end of session
@@ -428,7 +425,7 @@
             as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id
             as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id
 	    if {\[empty_string_p \$assessment_data(return_url)\]} {
-		ad_returnredirect \[export_vars -base finish {session_id assessment_id return_url next_asm}\]
+		ad_returnredirect \[export_vars -base finish {session_id assessment_id return_url}\]
 	    } else {
 		ad_returnredirect \$assessment_data(return_url)
 	    }
@@ -465,7 +462,7 @@
 	    # go to next section
 	    set section_order $new_section_order
 	    set item_order $new_item_order
-	    ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm}]
+	    ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url}]
 	    ad_script_abort
 	} else {
 	    # calculate session points at end of session
@@ -474,7 +471,7 @@
 	    as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id
             as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id
 	    if {[empty_string_p $assessment_data(return_url)]} {
-		ad_returnredirect [export_vars -base finish {session_id assessment_id return_url next_asm}]
+		ad_returnredirect [export_vars -base finish {session_id assessment_id return_url}]
 	    } else {
 		ad_returnredirect $assessment_data(return_url)
 	    }