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 -N -r1.4 -r1.5
--- openacs-4/packages/cms/tcl/form-procs-oracle.xql 29 Jul 2001 17:26:29 -0000 1.4
+++ openacs-4/packages/cms/tcl/form-procs-oracle.xql 29 Jul 2001 23:44:43 -0000 1.5
@@ -304,49 +304,101 @@
begin :revision_id := content_revision.new(
title => :title
-
-
, description => :description
-
-
, publish_date => :publish_date
-
-
, mime_type => :mime_type
-
-
, nls_language => :nls_language
-
-
, text => :text
+
+
+
+
+ , description => null
+
+
+ , publish_date => sysdate
+
+
+
+
+ , mime_type => 'text/plain'
+
+
+
+
+
+ , nls_language => null
+
+
+
+
+
+ , text => ' '
+
+
+
+
+
+ , item_id => content_symlink.resolve(:item_id),
+ revision_id => :revision_id,
+ creation_date => sysdate,
+ creation_ip => :creation_ip,
+ creation_user => :creation_user
+ ); end;
+
+
+
+
+
+
+ update cr_revisions
+ set content = empty_blob() where revision_id = :revision_id
+ returning content into :1
+
+
+
+
+
+
+
+ begin
+ content_revision.content_copy (
+ revision_id => :revision_id_src,
+ revision_id_dest => :revision_id_dest
+ );
+ end;
+
+
+
+
\ No newline at end of file
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 -N -r1.4 -r1.5
--- openacs-4/packages/cms/tcl/form-procs-postgresql.xql 29 Jul 2001 17:26:29 -0000 1.4
+++ openacs-4/packages/cms/tcl/form-procs-postgresql.xql 29 Jul 2001 23:44:43 -0000 1.5
@@ -189,7 +189,8 @@
update cr_revisions
- set content = empty_lob() where revision_id = :revision_id
+ set content = [set __lob_id [db_string get_id "select empty_lob()"]]
+ where revision_id = :revision_id
@@ -304,4 +305,88 @@
+
+
+ , :description
+
+
+
+
+
+ , :publish_date
+
+
+
+
+
+ , :mime_type
+
+
+
+
+
+ , :nls_language
+
+
+
+
+
+ , :text
+
+
+
+
+
+ , null
+
+
+
+
+
+ , now()
+
+
+
+
+
+ , 'text/plain'
+
+
+
+
+
+ , null
+
+
+
+
+
+ , ' '
+
+
+
+
+
+ , content_symlink__resolve(:item_id), :revision_id, now(), :creation_ip, :creation_user) as revision_id
+
+
+
+
+
+
+ update cr_revisions
+ set content = [set __lob_id [db_string get_id "select empty_lob()"]]
+ where revision_id = :revision_id
+
+
+
+
+
+
+
+ select content_revision__content_copy (:revision_id_src, :revision_id_dest)
+
+
+
+
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 -N -r1.7 -r1.8
--- openacs-4/packages/cms/tcl/form-procs.tcl 29 Jul 2001 17:26:29 -0000 1.7
+++ openacs-4/packages/cms/tcl/form-procs.tcl 29 Jul 2001 23:44:43 -0000 1.8
@@ -7,7 +7,6 @@
# a custom form element based on stored metadata
# Requires the variable content_type to be set in the calling frame
-# RBM: FIX ME! See comment on line 197
ad_proc content::query_form_metadata {
{datasource_name rows} {datasource_type multirow} \
{extra_where {}} {extra_orderby {}}
@@ -1806,7 +1805,7 @@
# @option mime_type
# @option text
# @option tmpfile
-
+# RBM: FIX ME. Not sure if this will work because of line 1822
ad_proc content::add_basic_revision { item_id revision_id title args } {
template::util::get_opts $args
@@ -1815,34 +1814,25 @@
set creation_user [User::getID]
set sql [db_map abr_new_revision_title]
- item_id => content_symlink.resolve(:item_id),
- revision_id => :revision_id,
- creation_date => sysdate,
- creation_ip => :creation_ip,
- creation_user => :creation_user
-
+
foreach param { description publish_date mime_type nls_language text } {
if { [info exists opts($param)] } {
- set $param $opts($param)
- append sql [db_map abr_new_revision_$param]", $param => :$param"
+ set $param $opts($param)
+ append sql [db_map abr_new_revision_$param]
} else {
- switch $param {
- "description"
+ append sql [db_map abr_new_revision_${param}_ne]
+ }
}
- append sql "); end;"
+ append sql [db_map abr_new_revision_end_items]
- set db [template::begin_db_transaction]
+ db_transaction " db_exec_plsql abr_new_revision_final $sql -bind revision_id "
- ns_ora exec_plsql_bind $db $sql revision_id
-
if { [info exists opts(tmpfile)] } {
update_content_from_file $revision_id $opts(tmpfile)
}
-
- template::end_db_transaction
}
# @private update_content_from_file
@@ -1853,15 +1843,15 @@
# @param tmpfile The name of a temporary file containing the content.
# The file is deleted following the update.
-proc content::update_content_from_file { revision_id tmpfile } {
+ad_proc content::update_content_from_file { revision_id tmpfile } {
- set file_upload "update cr_revisions
+ set file_upload "
+
+ db_dml upcff_update_cr_revisions "
+ update cr_revisions
set content = empty_blob() where revision_id = :revision_id
- returning content into :1"
+ returning content into :1" -blob_files [list $tmpfile]
- set db [template::get_db_handle]
- ns_ora blob_dml_file_bind $db $file_upload [list 1] $tmpfile
-
ns_unlink $tmpfile
}
@@ -1877,32 +1867,32 @@
# @param revision_id_dest The object ID of the revision to be updated.
# copied.
-proc content::copy_content { revision_id_src revision_id_dest } {
+ad_proc content::copy_content { revision_id_src revision_id_dest } {
- set db [template::begin_db_transaction]
+ db_transaction {
- # copy the content from the source to the target
- ns_ora dml $db "
- begin
- content_revision.content_copy (
- revision_id => :revision_id_src,
- revision_id_dest => :revision_id_dest
- );
- end;"
+ # copy the content from the source to the target
+ db_dml cc_copy_content {
+ begin
+ content_revision.content_copy (
+ revision_id => :revision_id_src,
+ revision_id_dest => :revision_id_dest
+ );
+ end;
+ }
+
+ # fetch the mime_type of the source revision
+ template::query cc_get_mime_type mime_type onevalue "
+ select mime_type from cr_revisions where revision_id = :revision_id_src"
- # fetch the mime_type of the source revision
- template::query mime_type onevalue "
- select mime_type from cr_revisions where revision_id = :revision_id_src
- " -db $db
+ # copy the mime_type to the destination revision
+ db_dml cc_update_cr_revisions "
+ update cr_revisions
+ set mime_type = :mime_type
+ where revision_id = :revision_id_dest"
- # copy the mime_type to the destination revision
- ns_ora dml $db "
- update cr_revisions
- set mime_type = :mime_type
- where revision_id = :revision_id_dest"
+ }
-
- template::end_db_transaction
}
@@ -1913,7 +1903,7 @@
# @param revision_id The object ID of the revision to be updated.
-proc content::add_content { form_name revision_id } {
+ad_proc content::add_content { form_name revision_id } {
# if content exists, prepare it for insertion
if { [template::element exists $form_name content] } {
@@ -1925,12 +1915,10 @@
}
if { ![string equal $tmpfile {}] } {
- set db [template::begin_db_transaction]
- upload_content $db $revision_id $tmpfile $filename
- template::end_db_transaction
- } else {
- # no content
- }
+ db_transaction {
+ upload_content $revision_id $tmpfile $filename
+ }
+ }
}
@@ -1941,20 +1929,20 @@
# @param form_name The name of the form (containing name and parent_id)
# @return 0 if there are items with the same name, 1 otherwise
-proc content::validate_name { form_name } {
+ad_proc content::validate_name { form_name } {
set name [template::element get_value $form_name name]
set parent_id [template::element get_value $form_name parent_id]
if { [template::util::is_nil parent_id] } {
- template::query same_name_count onevalue "
+ template::query vn_same_name_count1 same_name_count onevalue "
select
count(1)
from
cr_items
where
name = :name"
} else {
- template::query same_name_count onevalue "
+ template::query vn_same_name_count2 same_name_count onevalue "
select
count(1)
from
Index: openacs-4/packages/cms/tcl/form-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/tcl/form-procs.xql 29 Jul 2001 17:26:29 -0000 1.4
+++ openacs-4/packages/cms/tcl/form-procs.xql 29 Jul 2001 23:44:43 -0000 1.5
@@ -206,4 +206,43 @@
+
+
+
+ select mime_type from cr_revisions where revision_id = :revision_id_src
+
+
+
+
+
+
+
+ update cr_revisions
+ set mime_type = :mime_type
+ where revision_id = :revision_id_dest
+
+
+
+
+
+
+
+ select count(1)
+ from cr_items
+ where name = :name
+
+
+
+
+
+
+
+ select count(1)
+ from cr_items
+ where name = :name
+ and parent_id = :parent_id
+
+
+
+
\ No newline at end of file