Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql 26 Aug 2001 13:39:26 -0000 1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql 27 Aug 2001 03:59:17 -0000 1.5
@@ -1603,6 +1603,7 @@
v_subject varchar2(500);
v_body varchar2(4000);
v_num_assigned number;
+ request_id acs_mail_queue_messages.message_id%TYPE;
cursor assignees_cur is
select distinct u.user_id
from wf_task_assignments tasgn,
@@ -1941,4 +1942,14 @@
/
show errors;
+-- This is now handled by acs-mail - no longer necessary.
+-- DanW (dcwickstrom@earthlink.net).
+--
+-- schedule processing of the notification queue
+--
+-- begin
+-- nt.schedule_process(1,'localhost',25);
+-- end;
+-- /
+-- show errors;
Index: openacs-4/packages/cms/sql/oracle/cms-workflow.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/oracle/cms-workflow.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/sql/oracle/cms-workflow.sql 24 Aug 2001 14:44:58 -0000 1.2
+++ openacs-4/packages/cms/sql/oracle/cms-workflow.sql 27 Aug 2001 03:59:17 -0000 1.3
@@ -936,7 +936,7 @@
v_hold_user_old varchar(100);
v_hold_user_new varchar(100);
v_transition_name wf_transitions.transition_name%TYPE;
- v_request_id nt_requests.request_id%TYPE;
+ v_request_id acs_mail_queue_messages.message_id%TYPE;
v_item_name varchar(100);
begin
Index: openacs-4/packages/cms/tcl/form-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-oracle.xql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/cms/tcl/form-procs-oracle.xql 20 Aug 2001 04:35:41 -0000 1.10
+++ openacs-4/packages/cms/tcl/form-procs-oracle.xql 27 Aug 2001 03:59:17 -0000 1.11
@@ -164,11 +164,12 @@
-
+
update cr_revisions
- set content = empty_blob() where revision_id = :revision_id
- returning content into :1
+ set content ='[set file_path [cr_create_content_file $item_id $revision_id $tmpfile]]',
+ content_length = [cr_file_size $file_path]
+ where revision_id = :revision_id
Index: openacs-4/packages/cms/tcl/form-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-postgresql.xql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/cms/tcl/form-procs-postgresql.xql 20 Aug 2001 04:35:41 -0000 1.12
+++ openacs-4/packages/cms/tcl/form-procs-postgresql.xql 27 Aug 2001 03:59:17 -0000 1.13
@@ -183,13 +183,13 @@
-
+
update cr_revisions
- set content = '[read [set __f [open $tmpfile r]]] [close $__f]',
- content_length = '[file size $tmpfile]'
+ set content = '[set file_path [cr_create_content_file $item_id $revision_id $tmpfile]]',
+ content_length = '[cr_file_size $file_path]'
where revision_id = :revision_id
@@ -221,6 +221,46 @@
+
+
+
+
+ update cr_revisions
+ set content = '[set file_path [cr_create_content_file $item_id $revision_id $tmpfile]]',
+ content_length = '[cr_file_size $file_path]'
+ where revision_id = :revision_id
+
+
+
+
+
+
+
+ update
+ cr_revisions
+ set
+ content = '[DoubleApos [read [set __f [open $tmpfile r]]]][close $__f]',
+ content_length = [file size $tmpfile]
+ where
+ revision_id = :revision_id
+
+
+
+
+
+
+
+
+ update cr_revisions
+ set content = [set __lob_id [db_string new_lob "select empty_lob()"]]
+ where revision_id = :revision_id
+
+
+
+
+
+
+
Index: openacs-4/packages/cms/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/cms/tcl/form-procs.tcl 25 Aug 2001 14:20:31 -0000 1.13
+++ openacs-4/packages/cms/tcl/form-procs.tcl 27 Aug 2001 03:59:17 -0000 1.14
@@ -1993,13 +1993,38 @@
} {
+ db_1row get_storage_type {select
+ storage_type, item_id
+ from
+ cr_items
+ where
+ item_id = (select
+ item_id
+ from
+ cr_revisions
+ where revision_id = :revision_id)}
- db_dml upcff_update_cr_revisions "
- update cr_revisions
- set content = empty_blob() where revision_id = :revision_id
- returning content into :1" -blob_files [list $tmpfile]
+ if {[string equal $storage_type file]} {
+ db_dml upload_file_revision "
+ update cr_revisions
+ set content = '[set file_path [cr_create_content_file $item_id $revision_id $tmpfile]]',
+ content_length = [cr_file_size $file_path]
+ where revision_id = :revision_id"
+ } elseif {[string equal $storage_type text]} {
+ # upload the file into the revision content
+ db_dml upload_text_revision "update cr_revisions
+ set content = empty_blob() where revision_id = :revision_id
+ returning content into :1" -blob_files [list $tmpfile]
- ns_unlink $tmpfile
+ } else {
+ # upload the file into the revision content
+ db_dml upload_revision "update cr_revisions
+ set content = empty_blob() where revision_id = :revision_id
+ returning content into :1" -blob_files [list $tmpfile]
+ }
+
+ # delete the tempfile
+ ns_unlink $tmpfile
}
Index: openacs-4/packages/cms/tcl/workflow-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/workflow-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/tcl/workflow-procs-postgresql.xql 25 Aug 2001 14:20:31 -0000 1.4
+++ openacs-4/packages/cms/tcl/workflow-procs-postgresql.xql 27 Aug 2001 03:59:17 -0000 1.5
@@ -21,7 +21,7 @@
select acs_mail_nt__post_request(
- -1,
+ null,
:admin_id,
:subject,
:message
@@ -34,7 +34,7 @@
select acs_mail_nt__post_request(
- -1,
+ null,
:admin_id,
:subject,
:message
@@ -140,7 +140,7 @@
begin
return acs_mail_nt__post_request(
- -1, -- party_from
+ null, -- party_from
:admin_id, -- party_to
'f', -- expand_group
:subject, -- subject
@@ -196,7 +196,7 @@
begin
return acs_mail_nt__post_request(
- -1, -- party_from
+ null, -- party_from
:admin_id, -- party_to
'f', -- expand_group
:subject, -- subject
Index: openacs-4/packages/cms/www/modules/items/keywords-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/keywords-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/keywords-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1
+++ openacs-4/packages/cms/www/modules/items/keywords-oracle.xql 27 Aug 2001 03:59:17 -0000 1.2
@@ -15,7 +15,7 @@
where
item_id = :item_id
order by
- heading"
+ heading
Index: openacs-4/packages/cms/www/modules/items/publish-status-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/publish-status-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/publish-status-oracle.xql 25 May 2001 04:56:36 -0000 1.1
+++ openacs-4/packages/cms/www/modules/items/publish-status-oracle.xql 27 Aug 2001 03:59:17 -0000 1.2
@@ -53,7 +53,7 @@
child_type, relation_tag, min_n,
o.pretty_name as child_type_pretty,
o.pretty_plural as child_type_plural,
- case when max_n = null then '-' else max_n end max_n,
+ case when max_n = null then '-' else to_char(max_n) end as max_n,
(
select
count(*)
@@ -65,7 +65,7 @@
content_item.get_content_type( child_id ) = c.child_type
and
relation_tag = c.relation_tag
- ) child_count
+ ) as child_count
from
cr_type_children c, cr_items i, acs_object_types o
where
@@ -87,7 +87,7 @@
target_type, relation_tag, min_n,
o.pretty_name as target_type_pretty,
o.pretty_plural as target_type_plural,
- case when max_n = null then '-' else max_n end max_n,
+ case when max_n = null then '-' else to_char(max_n) end max_n,
(
select
count(*)
Index: openacs-4/packages/cms/www/modules/items/revisions-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revisions-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/revisions-oracle.xql 9 Jun 2001 01:06:04 -0000 1.2
+++ openacs-4/packages/cms/www/modules/items/revisions-oracle.xql 27 Aug 2001 03:59:17 -0000 1.3
@@ -31,7 +31,7 @@
- pagination::paginate_query "
+
select
revision_id,
trim(title) as title,
@@ -42,7 +42,7 @@
where
r.item_id = $item_id
order by
- revision_number desc" $page
+ revision_number desc
Index: openacs-4/packages/cms/www/modules/users/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/index-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/users/index-oracle.xql 26 May 2001 18:40:15 -0000 1.2
+++ openacs-4/packages/cms/www/modules/users/index-oracle.xql 27 Aug 2001 03:59:17 -0000 1.3
@@ -51,7 +51,7 @@
and
(aru.member_state <> 'deleted' or aru.member_state is null)
order by
- upper(pretty_name
+ upper(pretty_name)