Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/assessment/lib/session-items.adp	4 Jul 2008 10:22:35 -0000	1.17.2.1
+++ openacs-4/packages/assessment/lib/session-items.adp	7 Sep 2008 21:24:29 -0000	1.17.2.2
@@ -7,7 +7,7 @@
 <if @admin_p@><p><a href="@items.item_edit_general_url@">Edit this question</a></p></if>
 <if @feedback_only_p@ eq 0 or @items.has_feedback_p@ eq 1>
      <if @show_item_name_p@ eq t><p style="font-weight:bold;">@items.name@:</p></if>
-      <if @survey_p@ ne t and @items.title@ ne @items.next_title@>
+      <if @survey_p@ ne t and @items.as_item_id@ ne @items.next_as_item_id@>
 	<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
       </if>
      </if>
@@ -19,16 +19,16 @@
 	    <p style="font-weight:bold;">@items.title;noquote@</p>
 	     @items.content;noquote@
 	</if>
-	    <group column=title>
+	    <group column=as_item_id>
 	      @items.description;noquote@
 		<if @survey_p@ ne t>
-		  <if @items.title@ eq @items.next_title@ or @items.groupnum@ gt 1>
+		  <if @items.as_item_id@ eq @items.next_as_item_id@ or @items.groupnum@ gt 1>
 		    <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
 
 			    <if @show_feedback@ ne none>
 			      <if @items.feedback@ not nil>:<br>@items.feedback;noquote@</if>
 			    </if>
-		      <~--- fixme --->
+		      <!--- fixme --->
 		      <else>
 			<if @items.answered_p@ eq t><p style="font-weight:bold;">#assessment.not_yet_reviewed#</p> </if>
 			<else><p style="font-weight:bold;">#assessment.not_answered#</p></else>
@@ -52,7 +52,7 @@
 		      <div>@formgroup.widget;noquote@ @formgroup.label;noquote@</div>
 		    </formgroup>
 		  </if>
-		  <elseif @items.title@ ne @items.next_title@ and @items.groupnum@ eq 1>
+		  <elseif @items.as_item_id@ ne @items.next_as_item_id@ and @items.groupnum@ eq 1>
 		    <formgroup id="response_to_item.@items.as_item_id@">
 		      @formgroup.widget;noquote@ @formgroup.label;noquote@
 		    </formgroup>
Index: openacs-4/packages/assessment/lib/session-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.tcl,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/assessment/lib/session-items.tcl	4 Jul 2008 10:22:35 -0000	1.19.2.1
+++ openacs-4/packages/assessment/lib/session-items.tcl	7 Sep 2008 21:24:29 -0000	1.19.2.2
@@ -37,15 +37,14 @@
     {section_id:text(hidden) {value $section_id}}
 }
 set feedback_count 0
-db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num content has_feedback_p correct_p view item_edit_general_url results_edit_url } items session_items {} {
-
+db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_as_item_id next_pr_type num content has_feedback_p correct_p view item_edit_general_url results_edit_url} items session_items {} {
     # build URLs
     set item_edit_general_url [export_vars -base "asm-admin/item-edit-general" {as_item_id assessment_id section_id}]
     set results_edit_url [export_vars -base "results-edit" {session_id section_id as_item_id}]
 
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
     array set item [as::item::item_data -as_item_id $as_item_id]
-
+    
     set presentation_type [as::item_form::add_item_to_form -name session_results_$section_id -section_id $section_id -item_id $as_item_id -session_id $session_id -default_value $default_value -show_feedback $show_feedback -random_p $assessment_data(random_p)]
 
     if {$presentation_type == "fitb"} {
@@ -188,13 +187,13 @@
     set this(num) $counter
     if {$i < ${items:rowcount}} {
 	upvar 0 items:$j next
-	set this(next_title) $next(title)
+	set this(next_as_item_id) $next(as_item_id)
 	set this(next_pr_type) $next(presentation_type)
-	if {$this(title) != $next(title)} {
+	if {$this(as_item_id) != $next(as_item_id)} {
 	    incr counter
 	}
     } else {
-	set this(next_title) ""
+	set this(next_as_item_id) ""
 	set this(next_pr_type) ""
     }
 }
Index: openacs-4/packages/assessment/lib/session-items.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.xql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/assessment/lib/session-items.xql	7 Feb 2008 16:09:23 -0000	1.9
+++ openacs-4/packages/assessment/lib/session-items.xql	7 Sep 2008 21:24:29 -0000	1.9.2.1
@@ -4,12 +4,13 @@
 <fullquery name="session_items">
       <querytext>
       
-    select i.as_item_id, i.subtext, cr.content as title, cr.description, ci.name,
+    select i.as_item_id, i.subtext, cr.title, cr.description, ci.name,
 	   ism.required_p, ism.section_id, ism.sort_order, i.feedback_right,
-	   i.feedback_wrong, ism.max_time_to_complete, ism.points
+	   i.feedback_wrong, ism.max_time_to_complete, ism.points,
+                             cr.content as question_text
     from as_items i, cr_revisions cr, cr_items ci, as_item_section_map ism,
          as_session_items si
-    where ci.item_id = cr.item_id
+         where ci.item_id = cr.item_id
     and cr.revision_id = i.as_item_id
     and i.as_item_id = ism.as_item_id
     and ism.section_id = si.section_id