Index: openacs-4/packages/survey/survey.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/survey.info,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/survey/survey.info	23 Sep 2002 23:32:35 -0000	1.5
+++ openacs-4/packages/survey/survey.info	26 Oct 2002 18:25:20 -0000	1.5.2.1
@@ -49,6 +49,7 @@
             <file type="content_page" path="www/admin/name-edit.adp"/>
             <file type="content_page" path="www/admin/name-edit.tcl"/>
             <file type="query_file" path="www/admin/name-edit.xql"/>
+            <file type="content_page" path="www/admin/no-responses.adp"/>
             <file type="query_file" db_type="oracle" path="www/admin/one-respondent-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/admin/one-respondent-postgresql.xql"/>
             <file type="content_page" path="www/admin/one-respondent.adp"/>
@@ -69,7 +70,6 @@
             <file type="query_file" path="www/admin/question-add-3.xql"/>
             <file type="content_page" path="www/admin/question-add.adp"/>
             <file type="content_page" path="www/admin/question-add.tcl"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/question-copy-postgresql.xql"/>
             <file type="content_page" path="www/admin/question-copy.tcl"/>
             <file type="query_file" path="www/admin/question-copy.xql"/>
             <file type="content_page" path="www/admin/question-delete-2.tcl"/>
@@ -107,6 +107,7 @@
             <file type="query_file" db_type="postgresql" path="www/admin/response-limit-toggle-postgresql.xql"/>
             <file type="content_page" path="www/admin/response-limit-toggle.tcl"/>
             <file type="query_file" db_type="oracle" path="www/admin/responses-export-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/admin/responses-export-postgresql.xql"/>
             <file type="content_page" path="www/admin/responses-export.tcl"/>
             <file type="query_file" path="www/admin/responses-export.xql"/>
             <file type="content_page" path="www/admin/responses.adp"/>
@@ -117,6 +118,9 @@
             <file type="content_page" path="www/admin/send-mail.adp"/>
             <file type="content_page" path="www/admin/send-mail.tcl"/>
             <file type="query_file" path="www/admin/send-mail.xql"/>
+            <file type="query_file" path="www/admin/site-wide-survey-oracle.xql"/>
+            <file type="content_page" path="www/admin/site-wide-survey.adp"/>
+            <file type="content_page" path="www/admin/site-wide-survey.tcl"/>
             <file type="query_file" db_type="oracle" path="www/admin/survey-category-add-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/admin/survey-category-add-postgresql.xql"/>
             <file type="content_page" path="www/admin/survey-category-add.tcl"/>
@@ -157,7 +161,6 @@
             <file type="query_file" db_type="postgresql" path="www/index-postgresql.xql"/>
             <file type="content_page" path="www/index.adp"/>
             <file type="content_page" path="www/index.tcl"/>
-            <file type="content_page" path="www/master.adp"/>
             <file type="content_page" path="www/one-respondent.adp"/>
             <file type="content_page" path="www/one-respondent.tcl"/>
             <file type="query_file" path="www/one-respondent.xql"/>
@@ -181,9 +184,6 @@
             <file type="query_file" db_type="postgresql" path="www/response-postgresql.xql"/>
             <file type="content_page" path="www/view-attachment.tcl"/>
             <file type="query_file" path="www/view-attachment.xql"/>
-            <file type="query_file" path="www/admin/site-wide-survey-oracle.xql"/>
-            <file type="content_page" path="www/admin/site-wide-survey.adp"/>
-            <file type="content_page" path="www/admin/site-wide-survey.tcl"/>
         </files>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="allow_question_deavtivation_p"  default="0" description="Allow questions to be set inactive"/>
Index: openacs-4/packages/survey/www/admin/responses-export-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses-export-oracle.xql,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/survey/www/admin/responses-export-oracle.xql	16 Sep 2002 00:00:24 -0000	1.1
+++ openacs-4/packages/survey/www/admin/responses-export-oracle.xql	26 Oct 2002 18:25:26 -0000	1.1.2.1
@@ -61,7 +61,7 @@
           r.creation_date,
           q.abstract_data_type,
           q.sort_order
-     from survey_questions q, (select creation_user as user_id, creation_date, response_id from (select rownum as r_num, rt.* from survey_responses_latest rt where survey_id=:survey_id) where r_num >= $start and r_num <= $end) r, cc_users u, survey_sections ss
+     from survey_questions q, (select initial_user_id as user_id, creation_date, response_id from survey_responses_latest rt where survey_id=:survey_id) r, cc_users u, survey_sections ss
      where ss.survey_id=:survey_id
      and q.section_id=ss.section_id
      and r.user_id = u.user_id) sq
Index: openacs-4/packages/survey/www/admin/responses-export.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses-export.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/survey/www/admin/responses-export.xql	26 Oct 2002 13:59:43 -0000	1.1.2.1
+++ openacs-4/packages/survey/www/admin/responses-export.xql	26 Oct 2002 18:25:26 -0000	1.1.2.2
@@ -1,6 +1,18 @@
 <?xml version="1.0"?>
 <queryset>
 
+    <fullquery name="get_question_data_types">
+	<querytext>
+	  select question_id, abstract_data_type, q.sort_order,
+	    question_text
+	  from survey_questions q, survey_sections s
+	  where s.survey_id = :survey_id
+	    and s.section_id=q.section_id
+	  order by q.sort_order,q.question_id
+	</querytext>
+    </fullquery>
+
+
     <fullquery name="get_n_responses">
 	<querytext>
 	    select count(*) from survey_responses_latest
@@ -15,4 +27,4 @@
 	</querytext>
     </fullquery>
 
-</queryset>
\ No newline at end of file
+</queryset>