Index: openacs-4/contrib/packages/survey/survey.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/Attic/survey.info,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/contrib/packages/survey/survey.info	8 Oct 2003 15:54:51 -0000	1.2
+++ openacs-4/contrib/packages/survey/survey.info	13 Jan 2004 23:10:15 -0000	1.2.2.1
@@ -7,15 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.3d1" url="http://openacs.org/repository/download/apm/survey-0.3d1.apm">
+    <version name="0.4" url="http://openacs.org/repository/download/apm/survey-0.4.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <owner url="mailto:luke@museatech.net">Luke Pond</owner>
         <owner url="mailto:sussdorff@sussdorff.de">Malte Sussdorff</owner>
         <summary>New version of survey package for dotLRN/OpenACS 5.0</summary>
         <vendor url="http://dotlrn.mit.edu">dotLRN</vendor>
-        <description format="text/plain">New version of survey package for dotLRN/OpenACS 5.0</description>
+        <description format="text/plain">New version of survey package for dotLRN/OpenACS 5.0. This version supports branching and sections, uses ad_form templates but so far is not internationalized. Upgrade scripts are available for Oracle only (at the moment).</description>
 
-        <provides url="survey" version="0.3d1"/>
+        <provides url="survey" version="0.4"/>
         <requires url="notifications" version="0.1"/>
 
         <files>
Index: openacs-4/contrib/packages/survey/sql/oracle/survey-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/sql/oracle/Attic/survey-package-create.sql,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/contrib/packages/survey/sql/oracle/survey-package-create.sql	30 Sep 2003 12:10:01 -0000	1.2
+++ openacs-4/contrib/packages/survey/sql/oracle/survey-package-create.sql	13 Jan 2004 23:10:15 -0000	1.2.2.1
@@ -229,7 +229,8 @@
 	v_response_row survey_responses%ROWTYPE;
 	v_section_row survey_sections%ROWTYPE;
     begin
-
+    delete from survey_branches where section_id in (select section_id from survey_sections where survey_id=remove.survey_id);
+    delete from survey_conditions where question_id in (select question_id from survey_questions q, survey_sections s where s.section_id=q.section_id and s.survey_id=remove.survey_id);
 	for v_response_row in (select response_id
 		from survey_responses
 		where survey_id=remove.survey_id
@@ -309,6 +310,8 @@
     ) is
 	v_question_row survey_questions%ROWTYPE;
     begin
+        delete from survey_branches where section_id=remove.section_id;
+        delete from survey_conditions where question_id in (select question_id from survey_questions where section_id=remove.section_id);
 	for v_question_row in (select question_id
 		from survey_questions
 		where section_id=remove.section_id) loop