Index: openacs-4/packages/assessment/lib/finish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/finish.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/finish.tcl	16 Apr 2009 11:39:37 -0000	1.2
+++ openacs-4/packages/assessment/lib/finish.tcl	27 Oct 2014 16:40:55 -0000	1.3
@@ -5,8 +5,8 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @date   2005-01-20
 } {
-    session_id:integer,notnull
-    assessment_id:integer,notnull
+    session_id:naturalnum,notnull
+    assessment_id:naturalnum,notnull
     return_url:optional
     next_asm:optional
 } -properties {
@@ -16,7 +16,7 @@
 
 set user_id [ad_conn user_id]
 
-if { ![string eq $user_id 0]} {
+if { $user_id ne "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}
@@ -33,17 +33,17 @@
 
 
 
-if { [exists_and_not_null next_asm ] } {
+if { ([info exists next_asm] && $next_asm ne "") } {
     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 != ""} {
+    if { $return_url ne ""} {
 	ad_returnredirect "$return_url"
     } else {
-	if { [string eq $value $assessment_id] } {
+	if {$value eq $assessment_id} {
 	    ad_returnredirect "/pvt/home"
 	}
     }