Index: openacs-4/packages/assessment/www/asm-admin/export/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/export/index.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/asm-admin/export/index.xql 15 Feb 2005 18:07:50 -0000 1.5 +++ openacs-4/packages/assessment/www/asm-admin/export/index.xql 24 Mar 2005 14:31:13 -0000 1.6 @@ -21,18 +21,6 @@ - - - SELECT aic.object_id as choice_id, aic.title as choice_title, aic.item_id as choice_item_id, aic.name as choice_name, aic.description as choice_description, aic.choice_id, aic.mc_id, aic.data_type as choice_data_type, aic.numeric_value as choice_numeric_value, aic.text_value as choice_text_value, aic.boolean_value as choice_boolean_value, aic.content_value as choice_content_value, aic.feedback_text as choice_feedback_text, aic.selected_p as choice_selected_p, aic.correct_answer_p as choice_correct_answer_p, aic.sort_order as choice_sort_order, aic.percent_score as choice_percent_score, r2.revision_id as content_rev_id, r2.title as content_filename, r2.mime_type, r2.content as cr_file_name, i.content_type, i.storage_area_key - FROM cr_revisions r, as_item_choicesx aic - left outer join cr_revisions r2 on (r2.revision_id = aic.content_value) - left outer join cr_items i on (i.item_id = r2.item_id) - WHERE aic.mc_id= :mc_id - and r.revision_id = aic.choice_id - ORDER BY aic.sort_order - - - SELECT * @@ -121,16 +109,5 @@ and ir.rel_type = 'as_item_type_rel' - - - - SELECT count(aic.correct_answer_p) as num_answers_correct - FROM cr_revisions r, as_item_choicesx aic - left outer join cr_revisions r2 on (r2.revision_id = aic.content_value) - left outer join cr_items i on (i.item_id = r2.item_id) - WHERE aic.mc_id= :mc_id - and r.revision_id = aic.choice_id - and aic.correct_answer_p = 't' - - +