Index: openacs-4/packages/assessment/www/finish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/assessment/www/finish.tcl	9 May 2005 21:58:24 -0000	1.6
+++ openacs-4/packages/assessment/www/finish.tcl	12 Jun 2006 02:49:51 -0000	1.7
@@ -15,22 +15,35 @@
 }
 
 set user_id [ad_conn user_id]
-if { $user_id != 0} {
-    db_dml update_session {update as_sessions set subject_id=:user_id where session_id=:session_id}
+
+if { ![string eq $user_id 0]} {
     
+    db_dml update_session {update as_sessions set subject_id=:user_id where session_id=:session_id}
+    db_dml update_session {update as_item_data set subject_id=:user_id where session_id=:session_id}
 }
 
-if {[info exists return_url]} {
-    if { $return_url != ""} {
-	ad_returnredirect "$return_url"
-    }
-}
+
 set page_title "[_ assessment.Response_Submitted]"
 set context [list $page_title]
 
+callback imsld::finish_object -object_id $assessment_id 
 
+
+
 if { [exists_and_not_null next_asm ] } {
     ad_returnredirect "assessment?assessment_id=$next_asm"
+} 
+
+set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
+
+if  {[info exists return_url]} {
+    if { $return_url != ""} {
+	ad_returnredirect "$return_url"
+    } else {
+	if { [string eq $value $assessment_id] } {
+	    ad_returnredirect "/pvt/home"
+	}
+    } 
 }
 
 ad_return_template