Index: openacs-4/contrib/packages/survey/tcl/survey-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/tcl/Attic/survey-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/tcl/survey-procs.xql	19 Sep 2003 16:48:03 -0000	1.1
+++ openacs-4/contrib/packages/survey/tcl/survey-procs.xql	26 Jan 2004 15:39:41 -0000	1.2
@@ -54,10 +54,16 @@
 </querytext>
 </fullquery>
 
+<fullquery name="survey_section_add_to_form.answer_descriptions">
+    <querytext>
+    select max(answer_description), count(*) from survey_block_Sections bs, survey_block_questions bq where section_id=:section_id and bs.block_section_id=bq.block_section_id group by bs.block_section_id, bq.block_section_id order by bs.block_section_id
+    </querytext>
+</fullquery>
+
 <fullquery name="survey_section_add_to_form.block_choices">
     <querytext>
-    select label,block_section_id from survey_block_questions where section_id=:section_id order by block_section_id,
-    sort_order
+     select label,bs.block_section_id from survey_block_questions bq, survey_block_Sections bs where section_id=:section_id and bs.block_section_id=bq.block_section_id order by block_section_id,
+     sort_order
     </querytext>
 </fullquery>
 
@@ -104,7 +110,8 @@
   presentation_options,
   presentation_alignment,
   creation_user,
-  creation_date
+  creation_date,
+  predefined_question_id
 from
   survey_questions, acs_objects
 where
@@ -113,17 +120,9 @@
       </querytext>
 </fullquery>
 
-
-<fullquery name="survey_question_add_to_form.predefined_question_id">
-<querytext>
-	select predefined_question_id from survey_questions where
-	question_id=:question_id
-</querytext>
-</fullquery>
-
 <fullquery name="survey_question_add_to_form.predefined_question_data">
 <querytext>
-	select action_type,table_name,column_name,key_name from
+	select action_type,abstract_data_type,table_name,column_name,key_name from
 	survey_predefined_questions where predefined_question_id=:predefined_question_id
 </querytext>
 </fullquery>
@@ -447,8 +446,6 @@
 </fullquery>
 
 
-
-
 <fullquery name="survey_block_section_candidate_p.get_questions">
     <querytext>
     select question_text,abstract_data_type, presentation_type,