Index: openacs-4/packages/assessment/www/asm-admin/action-params.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/action-params.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/action-params.xql	18 Feb 2005 16:18:49 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/action-params.xql	12 Jun 2006 02:49:51 -0000	1.5
@@ -30,23 +30,15 @@
 
 <fullquery name="choices">
 <querytext>
-    select cri.title, sm.as_item_id
+    select cri.title, cri.item_id as as_item_id
     from as_item_section_map sm, cr_revisions cri
-    where sm.as_item_id = cri.revision_id and sm.section_id in (
-    select s.section_id
-    from as_sections s, cr_revisions cr, cr_items ci,
-    as_assessment_section_map asm,as_item_section_map sm
-    where ci.item_id = cr.item_id
-    and cr.revision_id = s.section_id
-    and s.section_id = asm.section_id 
-    and asm.assessment_id = :new_assessment_revision)
-
+    where sm.as_item_id = cri.revision_id and sm.section_id = :section_id
 </querytext>
 </fullquery>
 
 <fullquery name="prev_choices">
 <querytext>
-    select cri.title, sm.as_item_id
+    select cri.title, cri.item_id as as_item_id
     from as_item_section_map sm, cr_revisions cri
     where sm.as_item_id = cri.revision_id and sm.section_id in (
     select s.section_id