Index: openacs-4/contrib/packages/survey/survey.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/Attic/survey.info,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/contrib/packages/survey/survey.info	2 Sep 2004 15:17:46 -0000	1.3.2.2
+++ openacs-4/contrib/packages/survey/survey.info	21 Oct 2004 07:46:08 -0000	1.3.2.3
@@ -7,17 +7,17 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.6" url="http://openacs.org/repository/download/apm/survey-0.6.apm">
+    <version name="0.7d1" url="http://openacs.org/repository/download/apm/survey-0.7d1.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. 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.6"/>
+        <provides url="survey" version="0.7d1"/>
         <requires url="notifications" version="0.1"/>
-
+	<maturity>1</maturity>
         <files>
             <!-- No files -->
         </files>
Index: openacs-4/contrib/packages/survey/catalog/survey.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/catalog/Attic/survey.de_DE.ISO-8859-1.xml,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/contrib/packages/survey/catalog/survey.de_DE.ISO-8859-1.xml	14 Feb 2004 14:04:54 -0000	1.1
+++ openacs-4/contrib/packages/survey/catalog/survey.de_DE.ISO-8859-1.xml	21 Oct 2004 07:46:12 -0000	1.1.2.1
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="survey" package_version="0.4" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="survey" package_version="0.6" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="-__Created_by">Erstellt von</msg>
   <msg key="_on_creation_date"> am %creation_date%</msg>
+  <msg key="Action_on_submit">Auszuf�hrende Aktion</msg>
   <msg key="Actions">Aktionen</msg>
   <msg key="Active">Aktiviert?</msg>
   <msg key="Add_A_Question">Neue Frage hinzuf�gen</msg>
@@ -56,13 +57,15 @@
   <msg key="Email_Options">E-Mail-Optionen:</msg>
   <msg key="enable">Aktivieren</msg>
   <msg key="Enter_Message">Nachricht eingeben</msg>
+  <msg key="Execute_TCL-Code">TCL-Code ausf�hren</msg>
   <msg key="Extreme_Actions">Aktionen:</msg>
   <msg key="File_Attachment">Dateianhang</msg>
   <msg key="First_Name">Vorname</msg>
   <msg key="From">Zugeh�rige Evaluation:</msg>
   <msg key="From_1">Zugeh�rige Evaluation</msg>
   <msg key="General_Survey">Allgemeine Evaluation</msg>
   <msg key="Here_is_what">Teilnehmer</msg>
+  <msg key="Import_Responses">Antworten importieren</msg>
   <msg key="inactive">[Deaktiviert] </msg>
   <msg key="Integer">Ganze_Zahl</msg>
   <msg key="is">ist</msg>
@@ -188,6 +191,7 @@
   <msg key="No_surveys_active">Keine aktivierten Evaluationen vorhanden</msg>
   <msg key="non-">nicht </msg>
   <msg key="Not_Found">Nicht gefunden</msg>
+  <msg key="Nothing">Nichts</msg>
   <msg key="Number">Zahl</msg>
   <msg key="One_Respondent">Einzelner Teilnehmer</msg>
   <msg key="One_Response">Eine R�ckantwort</msg>
@@ -213,6 +217,7 @@
   <msg key="Return">Zur�ck</msg>
   <msg key="Score">Ergebnis</msg>
   <msg key="Scored_Survey">Bewertete Evaluation</msg>
+  <msg key="Sectioning">Sektionierung</msg>
   <msg key="Send_bulkmail">Gruppen-E-Mail senden</msg>
   <msg key="Send_Mail">E-Mail senden</msg>
   <msg key="Send_mail_to">E-Mail senden an</msg>
@@ -233,6 +238,7 @@
   <msg key="True_or_False">Richtig oder Falsch</msg>
   <msg key="TrueFalse">Richtig/Falsch</msg>
   <msg key="Type_of_Response">Zul�ssige Werte</msg>
+  <msg key="Update_DB">Eintrag in der Datenbank �ndern</msg>
   <msg key="Uploaded_file">Hochgeladene Datei:</msg>
   <msg key="View">Anzeigen</msg>
   <msg key="View_Response">R�ckantwort anzeigen</msg>
Index: openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/catalog/Attic/survey.en_US.ISO-8859-1.xml,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	12 Mar 2004 07:18:13 -0000	1.7
+++ openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	21 Oct 2004 07:46:12 -0000	1.7.2.1
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="survey" package_version="0.4" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="survey" package_version="0.6" locale="en_US" charset="ISO-8859-1">
 
   <msg key="--_Please_Choose_--">-- Please Choose --</msg>
   <msg key="-__Created_by">-  Created by</msg>
@@ -16,6 +16,7 @@
   <msg key="Add_one">Add one</msg>
   <msg key="Admin_This_Survey">Admin This Survey</msg>
   <msg key="allow_multiple">allow multiple</msg>
+  <msg key="Allow_other">Allow &quot;other&quot; field</msg>
   <msg key="Answer_Survey">Answer Survey</msg>
   <msg key="Answer_Text">Answer Text</msg>
   <msg key="Apply">Apply</msg>
@@ -30,6 +31,7 @@
   <msg key="By_user">By user</msg>
   <msg key="Change">Change</msg>
   <msg key="Checkboxes">Checkboxes</msg>
+  <msg key="Checkboxes_text">Checkboxes with text</msg>
   <msg key="choice">choice</msg>
   <msg key="Choose_a_Survey_Type">Choose a Survey Type</msg>
   <msg key="Choose_Survey_Type">Choose Survey Type</msg>
@@ -193,8 +195,11 @@
   <msg key="lt_Modify_previous_respo">Modify previous response</msg>
   <msg key="lt_Modify_Question_Respo">Modify Question Responses</msg>
   <msg key="lt_Multiple_Choice_Check">Multiple Choice (Checkbox, multiple answers allowed)</msg>
+  <msg key="lt_Multiple_Choice_Check_text">Multiple Choice (Checkboxes, multiple answer, with text)</msg>
   <msg key="lt_Multiple_Choice_Drop_">Multiple Choice (Drop Down, single answer allowed)</msg>
+  <msg key="lt_Multiple_Choice_Drop_text">Multiple Choice Select with text</msg>
   <msg key="lt_Multiple_Choice_Radio">Multiple Choice (Radio Buttons, single answer allowed)</msg>
+  <msg key="lt_Multiple_Choice_Radio_text">Multiple Choice Radio with text</msg>
   <msg key="lt_New_Page_after_this_s">New Page after this section</msg>
   <msg key="lt_No_appropriate_questi">No appropriate questions found</msg>
   <msg key="lt_No_file_given_for_imp">No file given for import!</msg>
@@ -385,6 +390,7 @@
   <msg key="Questions">Questions</msg>
   <msg key="radio">radio</msg>
   <msg key="Radio_buttons">Radio buttons</msg>
+  <msg key="Radio_buttons_text">Radio buttons with text</msg>
   <msg key="Red">Red</msg>
   <msg key="Required">Required?</msg>
   <msg key="Respondents">Respondents</msg>
@@ -402,6 +408,7 @@
   <msg key="Section_Name">Section Name</msg>
   <msg key="Sectioning">Sectioning:</msg>
   <msg key="Select_box">Select box</msg>
+  <msg key="Select_box_text">Select Box with text</msg>
   <msg key="Send_bulk_mail">Send bulk mail</msg>
   <msg key="Send_bulkmail">Send bulk
 	mail</msg>
Index: openacs-4/contrib/packages/survey/sql/postgresql/survey-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/sql/postgresql/Attic/survey-package-create.sql,v
diff -u -r1.2.2.3 -r1.2.2.4
--- openacs-4/contrib/packages/survey/sql/postgresql/survey-package-create.sql	2 Sep 2004 15:17:47 -0000	1.2.2.3
+++ openacs-4/contrib/packages/survey/sql/postgresql/survey-package-create.sql	21 Oct 2004 07:46:12 -0000	1.2.2.4
@@ -91,6 +91,10 @@
 
 --Create a new survey with a pretty_id
 
+-- API for survey_section objects
+
+--Create a new survey with a pretty_id
+
 create or replace function survey_section__new (integer,integer,varchar,text,boolean,integer,boolean,boolean,boolean,boolean,integer,integer,text)
 returns integer as '
 declare
@@ -164,72 +168,6 @@
 
 end;' language 'plpgsql';
 
-create or replace function survey_section__remove (integer)
-returns integer as '
-declare
-  remove_section_id             alias for $1;
-  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
-	PERFORM survey_question__remove(v_question_row.question_id);
-    end loop;
-
-    delete from survey_sections
-    where section_id = remove_section_id;
-
-    PERFORM acs_object__delete(remove_section_id);
-
-    return 0;
-
-end;' language 'plpgsql';
-
--- API for predefined questions
-
-create or replace function survey_predefined_question__new (integer,text,varchar,varchar,varchar,varchar,boolean,varchar,varchar,text,varchar,varchar,varchar,integer,integer)
-returns integer as '
-declare
-  new__predefined_question_id	alias for $1;	-- default null
-  new__question_text 		alias for $2;    -- default null
-  new__abstract_data_type	alias for $3;	-- default null
-  new__presentation_type	alias for $4;	-- default null
-  new__presentation_options	alias for $5;	-- default null
-  new__presentation_alignment	alias for $6;	-- default below
-  new__question_html_p 		alias for $7;	-- default f
-  new__summary_type		alias for $8;
-  new__action_type		alias for $9;	-- default null
-  new__tcl			alias for $10;	-- default null
-  new__table_name		alias for $11;	-- default null
-  new__column_name		alias for $12;	-- default null
-  new__key_name			alias for $13; 	-- default null
-  new__creation_user		alias for $14;	-- default null
-  new__context_id 		alias for $15;	-- default null
-  v_predefined_question_id	survey_predefined_questions.predefined_question_id%TYPE;
-begin
-    v_predefined_question_id := acs_object__new (
-        new__predefined_question_id,
-        ''survey_predefined_question'',
-        now(),
-        new__creation_user,
-        null,
-        new__context_id
-    );
-
-    insert into survey_predefined_questions
-    (predefined_question_id,question_text,abstract_data_type,presentation_type,presentation_options,presentation_alignment,question_html_p,summary_type,action_type,tcl,table_name,column_name,key_name)
-    values
-    (v_predefined_question_id,new__question_text,new__abstract_data_type,new__presentation_type,new__presentation_options,new__presentation_alignment,new__question_html_p,new__summary_type,new__action_type,new__tcl,new__table_name,new__column_name,new__key_name);
-    
-    return v_predefined_question_id;
-
-end;' language 'plpgsql';
-
--- API for Survey questions
-
 --API for a question with a pretty_id passed in.
 
 create or replace function survey_question__new (integer,integer,integer,text,varchar,boolean,boolean,varchar,varchar,varchar,boolean,varchar,varchar,integer,integer,integer,text)
@@ -325,6 +263,73 @@
 
 end;' language 'plpgsql';
 
+create or replace function survey_section__remove (integer)
+returns integer as '
+declare
+  remove_section_id             alias for $1;
+  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
+	PERFORM survey_question__remove(v_question_row.question_id);
+    end loop;
+
+    delete from survey_sections
+    where section_id = remove_section_id;
+
+    PERFORM acs_object__delete(remove_section_id);
+
+    return 0;
+
+end;' language 'plpgsql';
+
+-- API for predefined questions
+
+create or replace function survey_predefined_question__new (integer,text,varchar,varchar,varchar,varchar,boolean,varchar,varchar,text,varchar,varchar,varchar,integer,integer)
+returns integer as '
+declare
+  new__predefined_question_id	alias for $1;	-- default null
+  new__question_text 		alias for $2;    -- default null
+  new__abstract_data_type	alias for $3;	-- default null
+  new__presentation_type	alias for $4;	-- default null
+  new__presentation_options	alias for $5;	-- default null
+  new__presentation_alignment	alias for $6;	-- default below
+  new__question_html_p 		alias for $7;	-- default f
+  new__summary_type		alias for $8;
+  new__action_type		alias for $9;	-- default null
+  new__tcl			alias for $10;	-- default null
+  new__table_name		alias for $11;	-- default null
+  new__column_name		alias for $12;	-- default null
+  new__key_name			alias for $13; 	-- default null
+  new__creation_user		alias for $14;	-- default null
+  new__context_id 		alias for $15;	-- default null
+  v_predefined_question_id	survey_predefined_questions.predefined_question_id%TYPE;
+begin
+    v_predefined_question_id := acs_object__new (
+        new__predefined_question_id,
+        ''survey_predefined_question'',
+        now(),
+        new__creation_user,
+        null,
+        new__context_id
+    );
+
+    insert into survey_predefined_questions
+    (predefined_question_id,question_text,abstract_data_type,presentation_type,presentation_options,presentation_alignment,question_html_p,summary_type,action_type,tcl,table_name,column_name,key_name)
+    values
+    (v_predefined_question_id,new__question_text,new__abstract_data_type,new__presentation_type,new__presentation_options,new__presentation_alignment,new__question_html_p,new__summary_type,new__action_type,new__tcl,new__table_name,new__column_name,new__key_name);
+    
+    return v_predefined_question_id;
+
+end;' language 'plpgsql';
+
+-- API for Survey questions
+
+
 create or replace function survey_question__remove (integer)
 returns integer as '
 declare
@@ -346,8 +351,6 @@
 
 end;' language 'plpgsql';
 
-
-
 -- API for survey responses
 
 create or replace function survey_response__new(integer,integer,varchar,boolean,integer,varchar,integer,integer)
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/survey/sql/postgresql/upgrade/upgrade-0.6-0.7d1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?