Index: openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question-ae-2.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.xql	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.xql	23 Oct 2003 06:22:26 -0000	1.2
@@ -3,29 +3,45 @@
 
 <fullquery name="survey_question_valid_responses">
       <querytext>
-      select label from survey_predef_question_choices where question_id=:predefined_question_id
+      select label,choice_id from survey_predef_question_choices where question_id=:predefined_question_id
       </querytext>
 </fullquery>
 
 <fullquery name="update_question_text">
       <querytext>
       update survey_predefined_questions set
-      question_text=:question_text where predefined_question_id=:predefined_question_id
+      question_text=:question_text_new where predefined_question_id=:predefined_question_id
       </querytext>
 </fullquery>
 
+<!-- Deal with multiple choice questions. Insert, update and delete
+the choices from the list of choices -->
 
-<fullquery name="insert_survey_question_choice">
-      <querytext>
-      insert into survey_predef_question_choices (choice_id, question_id, label, sort_order)
-      values (:choice_id, :predefined_question_id, :trimmed_response, :count)
-      </querytext>
+<fullquery name="insert_new_choice">
+<querytext>
+insert into survey_predef_question_choices
+(choice_id, question_id, label, sort_order)
+values (:new_choice_id, :predefined_question_id, :choice_label, :sort_order)
+</querytext>
 </fullquery>
 
+<fullquery name="update_new_choice">
+<querytext>
+update survey_predef_question_choices
+                set label=:choice_label where choice_id=:choice_id_to_update
+</querytext>
+</fullquery>
+
+<fullquery name="delete_old_choice">
+<querytext>
+delete from survey_predef_question_choices where choice_id = :choice_id_to_delete
+</querytext>
+</fullquery>
+
 <fullquery name="edit_predefined_question">
       <querytext>
       update survey_predefined_questions set
-      question_text=:question_text,question_html_p=:question_html_p,abstract_data_type=:abstract_data_type,presentation_type=:presentation_type,presentation_options=:presentation_options,presentation_alignment=:presentation_alignment,action_type=:action_type,table_name=:table_name,column_name=:column_name,key_name=:key_name
+      question_text=:question_text_new,question_html_p=:question_html_p_new,abstract_data_type=:abstract_data_type,presentation_type=:presentation_type_new,presentation_options=:presentation_options,presentation_alignment=:presentation_alignment,action_type=:action_type,table_name=:table_name,column_name=:column_name,key_name=:key_name
       where predefined_question_id=:predefined_question_id
       </querytext>
 </fullquery>