Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql 17 Nov 2006 15:14:57 -0000 1.7
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql 2 Dec 2006 12:49:54 -0000 1.8
@@ -114,120 +114,4 @@
-
-
- insert into acs_mail_lite_complex_queue
- (creation_date,
- locking_server,
- to_party_ids,
- cc_party_ids,
- bcc_party_ids,
- to_group_ids,
- cc_group_ids,
- bcc_group_ids,
- to_addr,
- cc_addr,
- bcc_addr,
- from_addr,
- subject,
- body,
- package_id,
- files,
- file_ids,
- folder_ids,
- mime_type,
- object_id,
- single_email_p,
- no_callback_p,
- extraheaders,
- alternative_part_p,
- use_sender_p
- )
- values
- (:creation_date,
- :locking_server,
- :to_party_ids,
- :cc_party_ids,
- :bcc_party_ids,
- :to_group_ids,
- :cc_group_ids,
- :bcc_group_ids,
- :to_addr,
- :cc_addr,
- :bcc_addr,
- :from_addr,
- :subject,
- :body,
- :package_id,
- :files,
- :file_ids,
- :folder_ids,
- :mime_type,
- :object_id,
- (case when :single_email_p = '1' then TRUE else FALSE end),
- (case when :no_callback_p = '1' then TRUE else FALSE end),
- :extraheaders,
- (case when :alternative_part_p = '1' then TRUE else FALSE end),
- (case when :use_sender_p = '1' then TRUE else FALSE end)
- )
-
-
-
-
-
- select
- id,
- creation_date,
- locking_server,
- to_party_ids,
- cc_party_ids,
- bcc_party_ids,
- to_group_ids,
- cc_group_ids,
- bcc_group_ids,
- to_addr,
- cc_addr,
- bcc_addr,
- from_addr,
- subject,
- body,
- package_id,
- files,
- file_ids,
- folder_ids,
- mime_type,
- object_id,
- (case when single_email_p = TRUE then 1 else 0 end) as single_email_p,
- (case when no_callback_p = TRUE then 1 else 0 end) as no_callback_p,
- extraheaders,
- (case when alternative_part_p = TRUE then 1 else 0 end) as alternative_part_p,
- (case when use_sender_p = TRUE then 1 else 0 end) as use_sender_p
- from acs_mail_lite_complex_queue
- where locking_server = '' or locking_server is NULL
-
-
-
-
-
- select id
- from acs_mail_lite_complex_queue
- where id=:id and (locking_server = '' or locking_server is NULL)
-
-
-
-
-
- update acs_mail_lite_complex_queue
- set locking_server = :locking_server
- where id=:id
-
-
-
-
-
- delete from acs_mail_lite_complex_queue
- where id=:id
-
-
-
Index: openacs-4/packages/acs-mail-lite/tcl/complex-send-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/complex-send-procs-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/tcl/complex-send-procs-oracle.xql 2 Dec 2006 12:49:54 -0000 1.1
@@ -0,0 +1,98 @@
+
+
+ postgresql7.1
+
+
+
+
+ insert into acs_mail_lite_complex_queue
+ (creation_date,
+ locking_server,
+ to_party_ids,
+ cc_party_ids,
+ bcc_party_ids,
+ to_group_ids,
+ cc_group_ids,
+ bcc_group_ids,
+ to_addr,
+ cc_addr,
+ bcc_addr,
+ from_addr,
+ subject,
+ body,
+ package_id,
+ files,
+ file_ids,
+ folder_ids,
+ mime_type,
+ object_id,
+ single_email_p,
+ no_callback_p,
+ extraheaders,
+ alternative_part_p,
+ use_sender_p
+ )
+ values
+ (:creation_date,
+ :locking_server,
+ :to_party_ids,
+ :cc_party_ids,
+ :bcc_party_ids,
+ :to_group_ids,
+ :cc_group_ids,
+ :bcc_group_ids,
+ :to_addr,
+ :cc_addr,
+ :bcc_addr,
+ :from_addr,
+ :subject,
+ :body,
+ :package_id,
+ :files,
+ :file_ids,
+ :folder_ids,
+ :mime_type,
+ :object_id,
+ decode(:single_email_p,'1','t','f'),
+ decode(:no_callback_p,'1','t','f'),
+ :extraheaders,
+ decode(:alternative_part_p,'1','t','f'),
+ decode(:use_sender_p,'1','t','f')
+ )
+
+
+
+
+
+ select
+ id,
+ creation_date,
+ locking_server,
+ to_party_ids,
+ cc_party_ids,
+ bcc_party_ids,
+ to_group_ids,
+ cc_group_ids,
+ bcc_group_ids,
+ to_addr,
+ cc_addr,
+ bcc_addr,
+ from_addr,
+ subject,
+ body,
+ package_id,
+ files,
+ file_ids,
+ folder_ids,
+ mime_type,
+ object_id,
+ decode(single_email_p,'t',1,0) as single_email_p,
+ decode(no_callback_p,'t',1,0) as no_callback_p,
+ extraheaders,
+ decode(alternative_part_p,'t',1,0) as alternative_part_p,
+ decode(use_sender_p,'t',1,0) as use_sender_p
+ from acs_mail_lite_complex_queue
+ where locking_server = '' or locking_server is NULL
+
+
+
Index: openacs-4/packages/acs-mail-lite/tcl/complex-send-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/complex-send-procs-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/tcl/complex-send-procs-postgresql.xql 2 Dec 2006 12:49:54 -0000 1.1
@@ -0,0 +1,98 @@
+
+
+ postgresql7.1
+
+
+
+
+ insert into acs_mail_lite_complex_queue
+ (creation_date,
+ locking_server,
+ to_party_ids,
+ cc_party_ids,
+ bcc_party_ids,
+ to_group_ids,
+ cc_group_ids,
+ bcc_group_ids,
+ to_addr,
+ cc_addr,
+ bcc_addr,
+ from_addr,
+ subject,
+ body,
+ package_id,
+ files,
+ file_ids,
+ folder_ids,
+ mime_type,
+ object_id,
+ single_email_p,
+ no_callback_p,
+ extraheaders,
+ alternative_part_p,
+ use_sender_p
+ )
+ values
+ (:creation_date,
+ :locking_server,
+ :to_party_ids,
+ :cc_party_ids,
+ :bcc_party_ids,
+ :to_group_ids,
+ :cc_group_ids,
+ :bcc_group_ids,
+ :to_addr,
+ :cc_addr,
+ :bcc_addr,
+ :from_addr,
+ :subject,
+ :body,
+ :package_id,
+ :files,
+ :file_ids,
+ :folder_ids,
+ :mime_type,
+ :object_id,
+ (case when :single_email_p = '1' then TRUE else FALSE end),
+ (case when :no_callback_p = '1' then TRUE else FALSE end),
+ :extraheaders,
+ (case when :alternative_part_p = '1' then TRUE else FALSE end),
+ (case when :use_sender_p = '1' then TRUE else FALSE end)
+ )
+
+
+
+
+
+ select
+ id,
+ creation_date,
+ locking_server,
+ to_party_ids,
+ cc_party_ids,
+ bcc_party_ids,
+ to_group_ids,
+ cc_group_ids,
+ bcc_group_ids,
+ to_addr,
+ cc_addr,
+ bcc_addr,
+ from_addr,
+ subject,
+ body,
+ package_id,
+ files,
+ file_ids,
+ folder_ids,
+ mime_type,
+ object_id,
+ (case when single_email_p = TRUE then 1 else 0 end) as single_email_p,
+ (case when no_callback_p = TRUE then 1 else 0 end) as no_callback_p,
+ extraheaders,
+ (case when alternative_part_p = TRUE then 1 else 0 end) as alternative_part_p,
+ (case when use_sender_p = TRUE then 1 else 0 end) as use_sender_p
+ from acs_mail_lite_complex_queue
+ where locking_server = '' or locking_server is NULL
+
+
+
Index: openacs-4/packages/acs-mail-lite/tcl/complex-send-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/complex-send-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-mail-lite/tcl/complex-send-procs.tcl 2 Dec 2006 09:17:16 -0000 1.1
+++ openacs-4/packages/acs-mail-lite/tcl/complex-send-procs.tcl 2 Dec 2006 12:49:54 -0000 1.2
@@ -228,7 +228,6 @@
@param alternative_part_p Boolean whether or not the code generates a multipart/alternative mail (text/html)
} {
- set start_seconds [clock clicks]
set mail_package_id [apm_package_id_from_key "acs-mail-lite"]
if {[empty_string_p $package_id]} {
set package_id $mail_package_id
@@ -633,8 +632,6 @@
mime::finalize $multi_token -subordinates all
}
}
- set time_taken [expr [clock clicks] - $start_seconds]
- return $time_taken
}
#---------------------------------------
Index: openacs-4/packages/acs-mail-lite/tcl/complex-send-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/complex-send-procs.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/tcl/complex-send-procs.xql 2 Dec 2006 12:49:54 -0000 1.1
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+ select id
+ from acs_mail_lite_complex_queue
+ where id=:id and (locking_server = '' or locking_server is NULL)
+
+
+
+
+
+ update acs_mail_lite_complex_queue
+ set locking_server = :locking_server
+ where id=:id
+
+
+
+
+
+ delete from acs_mail_lite_complex_queue
+ where id=:id
+
+
+
+
+
+