Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v diff -u -r1.37 -r1.38 --- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 21 Feb 2005 14:32:54 -0000 1.37 +++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 24 Feb 2005 09:22:11 -0000 1.38 @@ -379,7 +379,7 @@ Response Options: Response Submitted Assessment results by user - (on %results.date% by <a href="%results.user_url%">%results.first_names% %results.last_name%</a>) + (on %results.create_date% by <a href="%results.user_url%">%results.first_names% %results.last_name%</a>) Edit assessment result Change explanation Return Index: openacs-4/packages/assessment/lib/item-show-oq.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-oq.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/lib/item-show-oq.tcl 21 Feb 2005 14:32:55 -0000 1.2 +++ openacs-4/packages/assessment/lib/item-show-oq.tcl 24 Feb 2005 09:22:11 -0000 1.3 @@ -2,7 +2,7 @@ # author Timo Hentschel (timo@timohentschel.de) db_1row item_type_data {} -set keywords [join $keywords "\n"] +set keywords [join $keywords ", "] ad_form -name item_show_oq -mode display -action item-edit-oq -export { assessment_id section_id as_item_id } -form { {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {value $title} {help_text "[_ assessment.oq_Title_help]"}} Index: openacs-4/packages/assessment/lib/results-edit-oq.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/results-edit-oq.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/lib/results-edit-oq.tcl 21 Feb 2005 14:32:55 -0000 1.1 +++ openacs-4/packages/assessment/lib/results-edit-oq.tcl 24 Feb 2005 09:22:11 -0000 1.2 @@ -2,9 +2,9 @@ # author Timo Hentschel (timo@timohentschel.de) db_1row item_type_data {} -set keywords [ad_quotehtml [join $keywords "\n"]] +set keywords [string tolower [ad_quotehtml [join $keywords "\n"]]] set answer_text [ad_text_to_html -no_links -- $answer_text] foreach keyword $keywords { - regsub -all $keyword $answer_text "$keyword" answer_text + regsub -all -nocase $keyword $answer_text {\0} answer_text } Index: openacs-4/packages/assessment/lib/results-messages.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/results-messages.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/lib/results-messages.xql 21 Feb 2005 14:32:55 -0000 1.1 +++ openacs-4/packages/assessment/lib/results-messages.xql 24 Feb 2005 09:22:11 -0000 1.2 @@ -5,7 +5,7 @@ select cr.title, cr.description, sr.points, p.first_names, p.last_name, - to_char(o.creation_date, :format) as date, o.creation_user + to_char(o.creation_date, :format) as create_date, o.creation_user from as_session_results sr, cr_revisions cr, acs_objects o, persons p, as_item_data d, as_session_item_map m where cr.revision_id = sr.result_id Index: openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl 21 Feb 2005 14:32:56 -0000 1.14 +++ openacs-4/packages/assessment/tcl/as-item-type-oq-procs.tcl 24 Feb 2005 09:22:12 -0000 1.15 @@ -108,7 +108,7 @@ array set values $default_value set default $values(clob_answer) } else { - db_1row item_type_data {} + set default [db_string item_type_data {}] } return [list $default ""] @@ -136,7 +136,7 @@ if {[llength $keywords] > 0} { set points 0 foreach keyword $keywords { - if {[regexp $keyword $response]} { + if {[regexp -nocase [string tolower $keyword] $response]} { incr points } } Index: openacs-4/packages/assessment/tcl/as-item-type-oq-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-oq-procs.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/tcl/as-item-type-oq-procs.xql 21 Feb 2005 14:32:56 -0000 1.5 +++ openacs-4/packages/assessment/tcl/as-item-type-oq-procs.xql 24 Feb 2005 09:22:12 -0000 1.6 @@ -26,7 +26,7 @@ - select default_value as default + select default_value from as_item_type_oq where as_item_type_id = :type_id Index: openacs-4/packages/assessment/www/session-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/session-oracle.xql 21 Feb 2005 14:32:56 -0000 1.1 +++ openacs-4/packages/assessment/www/session-oracle.xql 24 Feb 2005 09:22:12 -0000 1.2 @@ -1,6 +1,6 @@ - postgresql7.3 + oracle8.1.6 Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl 9 Feb 2005 10:59:11 -0000 1.4 +++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl 24 Feb 2005 09:22:12 -0000 1.5 @@ -90,7 +90,6 @@ foreach choice_id [array names feedback] { set feedback_text $feedback($choice_id) set selected_p [ad_decode [info exists selected($choice_id)] 0 f t] - set choice_id [string range $choice_id 0 3] set percent_score $percent($choice_id) set fixed_position $fixed_pos($choice_id) set answer_value $answer_val($choice_id) Index: openacs-4/packages/assessment/www/asm-admin/results-session-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/asm-admin/results-session-oracle.xql 21 Feb 2005 14:32:56 -0000 1.1 +++ openacs-4/packages/assessment/www/asm-admin/results-session-oracle.xql 24 Feb 2005 09:22:12 -0000 1.2 @@ -1,6 +1,6 @@ - postgresql7.3 + oracle8.1.6