Index: openacs-4/packages/assessment/tcl/as-item-data-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-data-procs.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/assessment/tcl/as-item-data-procs.xql 19 Jan 2005 16:49:14 -0000 1.4 +++ openacs-4/packages/assessment/tcl/as-item-data-procs.xql 25 Jan 2005 12:47:22 -0000 1.5 @@ -50,7 +50,7 @@ and d.as_item_id = r.revision_id and r2.revision_id = :as_item_id and r.item_id = r2.item_id - order by d.session_id decr + order by d.session_id desc Index: openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl 18 Jan 2005 12:42:37 -0000 1.8 +++ openacs-4/packages/assessment/tcl/as-item-display-cb-procs.tcl 25 Jan 2005 12:47:22 -0000 1.9 @@ -115,15 +115,15 @@ # numerical alphabetical randomized order_of_entry switch -exact $sort_order_type { - numerical { - set data [lsort -command as::assessment::compare_numbers $data] - } alphabetical { set data [lsort -dictionary -index 0 $data] } randomized { set data [util::randomize_list $data] } + default { + set data [lsort -dictionary -index 0 $data] + } } set optional "" Index: openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl 18 Jan 2005 12:42:37 -0000 1.8 +++ openacs-4/packages/assessment/tcl/as-item-display-rb-procs.tcl 25 Jan 2005 12:47:22 -0000 1.9 @@ -115,15 +115,15 @@ # numerical alphabetical randomized order_of_entry switch -exact $sort_order_type { - numerical { - set data [lsort -command as::assessment::compare_numbers $data] - } alphabetical { set data [lsort -dictionary -index 0 $data] } randomized { set data [util::randomize_list $data] } + default { + set data [lsort -dictionary -index 0 $data] + } } set optional "" Index: openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl 18 Jan 2005 12:42:37 -0000 1.6 +++ openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl 25 Jan 2005 12:47:22 -0000 1.7 @@ -119,15 +119,15 @@ # multiple_p # numerical alphabetical randomized order_of_entry switch -exact $sort_order_type { - numerical { - set data [lsort -command as::assessment::compare_numbers $data] - } alphabetical { set data [lsort -dictionary -index 0 $data] } randomized { set data [util::randomize_list $data] } + default { + set data [lsort -dictionary -index 0 $data] + } } set optional "" Index: openacs-4/packages/assessment/tcl/as-section-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-procs.tcl,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/assessment/tcl/as-section-procs.tcl 23 Jan 2005 18:10:48 -0000 1.15 +++ openacs-4/packages/assessment/tcl/as-section-procs.tcl 25 Jan 2005 12:47:22 -0000 1.16 @@ -288,10 +288,16 @@ } db_1row sum_of_item_points {} + + # Make sure we have valid points for the calculation if ![exists_and_not_null section_max_points] { set section_max_points 0 } + if ![exists_and_not_null item_points] { + set item_points 0 + } + if {![exists_and_not_null item_max_points]||$item_max_points==0} { set item_max_points 1 }