Index: openacs-4/packages/assessment/tcl/as-qti-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-qti-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/tcl/as-qti-procs.tcl	22 Nov 2004 11:40:42 -0000	1.11
+++ openacs-4/packages/assessment/tcl/as-qti-procs.tcl	2 Dec 2004 16:18:55 -0000	1.12
@@ -138,20 +138,7 @@
 				set as_items__description [$mattext nodeValue]
 			}
 		}
-		# <itemfeedback>
-		set itemfeedbackNodes [$item selectNodes {itemfeedback}]
-		foreach itemfeedback $itemfeedbackNodes {
-			# right feedback
-			if {[regexp displayRight [$itemfeedback getAttribute {ident} {}]]} {
-				set feedback_textNodes [$itemfeedback selectNodes {.//mattext/text()}]
-				set as_items__feedback_right [[lindex $feedback_textNodes 0] nodeValue]
-			}
-			# wrong feedback
-			if {[regexp displayWrong [$itemfeedback getAttribute {ident} {}]]} {
-				set feedback_textNodes [$itemfeedback selectNodes {.//mattext/text()}]
-				set as_items__feedback_wrong [[lindex $feedback_textNodes 0] nodeValue]
-			}
-		}
+
 		# <resprocessing>
 		set resprocessingNodes [$item selectNodes {resprocessing}]
 		foreach resprocessing $resprocessingNodes {
@@ -180,6 +167,25 @@
 					}
 					set as_item_choices__score($choice) $score
 				}
+				#<displayfeedback>
+				set displayfeedbackNodes [$respcondition selectNodes {displayfeedback}]
+			        if {[llength $displayfeedbackNodes]>0} {
+			            set displayfeedbackelement [lindex $displayfeedbackNodes 0]
+				    set displayfeedback__ident [$displayfeedbackelement getAttribute {linkrefid}]
+				# <itemfeedback>
+				set itemfeedbackNodes [$item selectNodes {itemfeedback}]
+				foreach itemfeedback $itemfeedbackNodes {
+				    # wrong feedback
+				    if {[string compare [$itemfeedback getAttribute {ident}] $displayfeedback__ident] == 0} {
+				        set feedback_textNodes [$itemfeedback selectNodes {.//mattext/text()}]
+				        set as_items__feedback_wrong [[lindex $feedback_textNodes 0] nodeValue]
+				    # right feedback
+				    } else {
+				        set feedback_textNodes [$itemfeedback selectNodes {.//mattext/text()}]
+					set as_items__feedback_right [[lindex $feedback_textNodes 0] nodeValue]
+				    }
+				}
+				}
 			}
 		}
 		# <presentation> element