Index: openacs-4/packages/bulk-mail/bulk-mail.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/bulk-mail.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/bulk-mail/bulk-mail.info	15 May 2007 20:14:20 -0000	1.13
+++ openacs-4/packages/bulk-mail/bulk-mail.info	1 Apr 2009 15:00:19 -0000	1.14
@@ -7,15 +7,17 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.5.1d7" url="http://openacs.org/repository/download/apm/bulk-mail-0.5.1d7.apm">
+    <version name="0.5.2d2" url="http://openacs.org/repository/download/apm/bulk-mail-0.5.2d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2003-11-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <summary>Mailing form letters to groups of users.</summary>
-        <provides url="bulk-mail" version="0.5.1d7"/>
-        <requires url="acs-mail-lite" version="5.3.1a1"/>
         <description format="text/html">Provides an API for sending messages to a collection of users (which can be chosen via arbitrary sql).  Mails can be personalized and can be scheduled for a later date.</description>
 
+
+        <provides url="bulk-mail" version="0.5.2d2"/>
+        <requires url="acs-mail-lite" version="5.5.0d1"/>
+
         <callbacks>
         </callbacks>
         <parameters>
Index: openacs-4/packages/bulk-mail/sql/postgresql/upgrade/upgrade-0.5.2d1-0.5.2d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/sql/postgresql/upgrade/upgrade-0.5.2d1-0.5.2d2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bulk-mail/sql/postgresql/upgrade/upgrade-0.5.2d1-0.5.2d2.sql	1 Apr 2009 15:00:20 -0000	1.1
@@ -0,0 +1,69 @@
+--
+-- Upgrade for 0.5.2d2 
+--
+
+create or replace function bulk_mail__new (integer, integer, varchar, varchar, varchar, varchar, varchar, varchar, varchar, text, varchar, timestamptz, integer, varchar, integer)
+returns integer as '
+declare
+    bulk_mail__new__bulk_mail_id alias for $1; -- default to null
+    bulk_mail__new__package_id alias for $2;
+    bulk_mail__new__send_date alias for $3; -- default to null
+    bulk_mail__new__date_format alias for $4; -- default to "YYYY MM DD HH24 MI SS"
+    bulk_mail__new__status alias for $5; -- default to "pending"
+    bulk_mail__new__from_addr alias for $6;
+    bulk_mail__new__subject alias for $7; -- default to null
+    bulk_mail__new__reply_to alias for $8; -- default to null
+    bulk_mail__new__extra_headers alias for $9; -- default to null
+    bulk_mail__new__message alias for $10;
+    bulk_mail__new__query alias for $11;
+    bulk_mail__new__creation_date alias for $12; -- default to now()
+    bulk_mail__new__creation_user alias for $13; -- default to null
+    bulk_mail__new__creation_ip alias for $14; -- default to null
+    bulk_mail__new__context_id alias for $15; -- default to null
+    v_bulk_mail_id integer;
+    v_send_date varchar(4000);
+    v_date_format varchar(4000);
+    v_status varchar(100);
+begin
+
+    v_bulk_mail_id := acs_object__new(
+        bulk_mail__new__bulk_mail_id,
+        ''bulk_mail_message'',
+        bulk_mail__new__creation_date,
+        bulk_mail__new__creation_user,
+        bulk_mail__new__creation_ip,
+        bulk_mail__new__context_id
+    );
+
+    v_date_format := bulk_mail__new__date_format;
+    if v_date_format is null then
+        v_date_format := ''YYYY MM DD HH24 MI SS'';
+    end if;
+
+    v_send_date := bulk_mail__new__send_date;
+    if v_send_date is null then
+        select to_char(now(), bulk_mail__new__date_format)
+        into v_send_date;
+    end if;
+
+    v_status := bulk_mail__new__status;
+    if v_status is null then
+        v_status := ''pending'';
+    end if;
+
+    insert
+    into bulk_mail_messages
+    (bulk_mail_id, package_id,
+     send_date, status,
+     from_addr, subject, reply_to,
+     extra_headers, message, query)
+    values
+    (v_bulk_mail_id, bulk_mail__new__package_id,
+     to_timestamp(v_send_date, v_date_format), v_status,
+     bulk_mail__new__from_addr, bulk_mail__new__subject, bulk_mail__new__reply_to,
+     bulk_mail__new__extra_headers, bulk_mail__new__message, bulk_mail__new__query);
+
+    return v_bulk_mail_id;
+
+end;
+' language 'plpgsql';