Index: openacs-4/packages/assessment/tcl/assessment-qti-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/Attic/assessment-qti-procs.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/assessment/tcl/assessment-qti-procs.tcl 23 Sep 2004 18:46:56 -0000 1.20 +++ openacs-4/packages/assessment/tcl/assessment-qti-procs.tcl 28 Sep 2004 14:42:42 -0000 1.21 @@ -93,7 +93,8 @@ set as_items__name [$item getAttribute {ident}] array set as_item_choices__correct_answer_p {} array set as_item_choices__score {} - set as_items__feedback_text {} + set as_items__feedback_right {} + set as_items__feedback_wrong {} set objectivesNodes [$item selectNodes {objectives}] foreach objectives $objectivesNodes { set mattextNodes [$objectives selectNodes {material/mattext/text()}] @@ -103,9 +104,13 @@ } set itemfeedbackNodes [$item selectNodes {itemfeedback}] foreach itemfeedback $itemfeedbackNodes { + if {[regexp displayRight [$itemfeedback getAttribute {ident} {}]]} { + set feedback_textNodes [$itemfeedback selectNodes {.//mattext/text()}] + set as_items__feedback_right [[lindex $feedback_textNodes 0] nodeValue] + } if {[regexp displayWrong [$itemfeedback getAttribute {ident} {}]]} { set feedback_textNodes [$itemfeedback selectNodes {.//mattext/text()}] - set as_items__feedback_text [[lindex $feedback_textNodes 0] nodeValue] + set as_items__feedback_wrong [[lindex $feedback_textNodes 0] nodeValue] } } set resprocessingNodes [$item selectNodes {resprocessing}] @@ -159,7 +164,7 @@ set as_item__display_type_id 1 } # Insert as_item in the CR (and as_items table) getting the revision_id (as_item_id) - set as_item_id [as_item_new -name $as_items__name -title $as_items__title -feedback_text $as_items__feedback_text] + set as_item_id [as_item_new -name $as_items__name -title $as_items__title -feedback_right $as_items__feedback_right -feedback_wrong $as_items__feedback_wrong] lappend items $as_item_id foreach node $nodeNodes { if {[$node nodeName] == {material}} { @@ -190,7 +195,7 @@ } set as_item_type_id [as_item_type_mc_new -name $as_item_type__name] # Insert as_item in the CR (and as_items table) getting the revision_id (as_item_id) - set as_item_id [as_item_new -name $as_items__name -title $as_items__title -feedback_text $as_items__feedback_text] + set as_item_id [as_item_new -name $as_items__name -title $as_items__title -feedback_right $as_items__feedback_right -feedback_wrong $as_items__feedback_wrong] lappend items $as_item_id content::item::relate -item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_id"] -object_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_type_id"] -relation_tag {as_item_type_rel} -relation_type {cr_item_rel} content::item::relate -item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_id"] -object_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_display_id"] -relation_tag {as_item_display_rel} -relation_type {cr_item_rel}