Index: openacs-4/packages/assessment/www/session.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/assessment/www/session.tcl	22 Nov 2004 11:40:43 -0000	1.18
+++ openacs-4/packages/assessment/www/session.tcl	25 Nov 2004 16:51:44 -0000	1.19
@@ -81,6 +81,14 @@
   }
   
   db_foreach choices {} {
+      set choice_id_answer ""
+      set text_answer ""
+      db_0or1row answer_info {
+          select aid.text_answer, aid.choice_id_answer
+	  from as_item_data aid
+	  where aid.choice_id_answer=:choice_id
+	  and (aid.session_id = :session_id or aid.session_id is null)
+    }
     if {[string length "$choice_id_answer"]} {set notanswered 0}
     set choice_correct 0
     #for fill in the blank item
Index: openacs-4/packages/assessment/www/session.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.xql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/assessment/www/session.xql	3 Nov 2004 14:51:52 -0000	1.10
+++ openacs-4/packages/assessment/www/session.xql	25 Nov 2004 16:51:44 -0000	1.11
@@ -15,10 +15,10 @@
 	<fullquery name="choices">
 		<querytext>
                 SELECT
-                as_item_choicesx.choice_id, as_item_choicesx.title AS choice_title, as_item_choicesx.correct_answer_p, as_item_choicesx.percent_score, as_item_choicesx.text_value, as_item_choicesx.content_value, as_item_datax.text_answer, as_item_datax.choice_id_answer
-                FROM as_item_choicesx LEFT JOIN (as_item_datax INNER JOIN as_sessionsx ON as_sessionsx.session_id = as_item_datax.session_id) ON as_item_datax.choice_id_answer=as_item_choicesx.choice_id
+                as_item_choicesx.choice_id, as_item_choicesx.title AS choice_title, as_item_choicesx.correct_answer_p, as_item_choicesx.percent_score, as_item_choicesx.text_value, as_item_choicesx.content_value
+                FROM as_item_choicesx
                 WHERE
-                as_item_choicesx.mc_id=:mc_id AND (as_sessionsx.session_id = :session_id OR as_sessionsx.session_id IS NULL)
+                as_item_choicesx.mc_id=:mc_id
                 ORDER BY
                 as_item_choicesx.sort_order
 		</querytext>