Index: openacs-4/packages/assessment/www/assessment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.tcl,v diff -u -N -r1.47.2.8 -r1.47.2.9 --- openacs-4/packages/assessment/www/assessment.tcl 6 Feb 2006 20:08:29 -0000 1.47.2.8 +++ openacs-4/packages/assessment/www/assessment.tcl 7 Feb 2006 10:42:47 -0000 1.47.2.9 @@ -51,7 +51,7 @@ set assessment_rev_id $assessment_data(assessment_rev_id) set number_tries $assessment_data(number_tries) db_1row total_tries {} -if {![empty_string_p $number_tries] && $number_tries >= $total_tries} { +if {![empty_string_p $number_tries] && $number_tries <= $total_tries} { ad_returnredirect [export_vars -base sessions {assessment_id}] } set errors [as::assessment::check_session_conditions -assessment_id $assessment_rev_id -subject_id $user_id -password $password] Index: openacs-4/packages/assessment/www/assessment.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.xql,v diff -u -N -r1.14.2.2 -r1.14.2.3 --- openacs-4/packages/assessment/www/assessment.xql 6 Feb 2006 20:08:29 -0000 1.14.2.2 +++ openacs-4/packages/assessment/www/assessment.xql 7 Feb 2006 10:42:47 -0000 1.14.2.3 @@ -93,12 +93,10 @@ select count(*) as total_tries, max(session_id) as last_session_id - from as_sessions s, cr_revisions r, cr_revisions r2 + from as_sessions s where s.subject_id = :user_id and s.completed_datetime is not null - and s.assessment_id = r.revision_id - and r.item_id = r2.item_id - and r2.revision_id = :assessment_id + and s.assessment_id = :assessment_rev_id