Index: openacs-4/packages/assessment/www/asm-admin/results-export.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-export.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/results-export.xql	18 Aug 2005 17:33:42 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/results-export.xql	17 Feb 2006 12:13:55 -0000	1.6
@@ -3,7 +3,13 @@
 
 <fullquery name="all_sections">
       <querytext>
-	select item_id from as_assessment_section_map asm, cr_items ci where asm.assessment_id = $assessment_rev_id and asm.section_id = ci.latest_revision
+
+	select asm.section_id, cr.item_id
+        from as_assessment_section_map asm, cr_revisions cr
+        where asm.assessment_id = :assessment_rev_id
+        and asm.section_id = cr.revision_id
+        order by asm.sort_order
+
       </querytext>
 </fullquery>
 
@@ -12,16 +18,15 @@
 
 	select cr.title, cr.description, o.object_type, i.data_type, i.field_name,
 	       cr.item_id as as_item_item_id
-	from as_item_section_map ism, cr_revisions cr, cr_items ci,
+	from as_item_section_map ism, cr_revisions cr,
 	     as_items i, as_item_rels ir, acs_objects o
-	where ism.section_id = ci.latest_revision
-	and ci.item_id = $section_id
+	where ism.section_id = :section_id
 	and cr.revision_id = ism.as_item_id
 	and i.as_item_id = ism.as_item_id
 	and ir.item_rev_id = i.as_item_id
 	and ir.rel_type = 'as_item_type_rel'
 	and o.object_id = ir.target_rev_id
-	order by o.object_type, ism.sort_order
+	order by ism.sort_order, o.object_type
 
       </querytext>
 </fullquery>
@@ -49,12 +54,15 @@
       <querytext>
 
 	select d.session_id, d.item_data_id, c.text_value, rc.title, ri.item_id as mc_item_id
-	from as_item_data d, as_session_item_map m, cr_revisions ri, cr_revisions rs,
-	     as_item_data_choices dc, as_item_choices c, cr_revisions rc
-	where d.session_id in ([join $session_list ,])
+	from as_item_data d, as_session_item_map m, cr_revisions ri,
+	     as_item_data_choices dc, as_item_choices c, cr_revisions rc,
+             as_session_sections s, cr_revisions rs
+	where s.session_id in ([join $session_list ,])
+        and s.section_id = rs.revision_id
+        and rs.item_id = :section_item_id
+        and d.session_id = s.session_id
 	and d.as_item_id = ri.revision_id
-	and d.section_id = rs.revision_id
-	and rs.item_id = $section_id
+	and d.section_id = s.section_id
 	and m.session_id = d.session_id
 	and m.item_data_id = d.item_data_id
 	and dc.item_data_id = d.item_data_id