Index: openacs-4/packages/cms/www/modules/categories/delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/delete-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/categories/delete-oracle.xql 25 May 2001 02:56:11 -0000 1.1
+++ openacs-4/packages/cms/www/modules/categories/delete-oracle.xql 26 May 2001 19:45:03 -0000 1.2
@@ -5,7 +5,7 @@
- begin content_keyword.delete(:id); end;
+ begin :1 := content_keyword.delete(:id); end;
Index: openacs-4/packages/cms/www/modules/categories/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/delete.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/categories/delete.tcl 24 May 2001 01:30:52 -0000 1.2
+++ openacs-4/packages/cms/www/modules/categories/delete.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -22,7 +22,7 @@
db_transaction {
# Otherwise, delete the folder
- set delete_keyword [db_exec_plsql delete_keyword "begin content_keyword.delete(:id); end;"]
+ set delete_keyword [db_exec_plsql delete_keyword "begin :1 := content_keyword.delete(:id); end;"]
}
# Remove it from the clipboard, if it exists
Index: openacs-4/packages/cms/www/modules/items/relate-items-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/relate-items-2.tcl 24 May 2001 23:57:17 -0000 1.3
+++ openacs-4/packages/cms/www/modules/items/relate-items-2.tcl 26 May 2001 19:45:03 -0000 1.4
@@ -142,15 +142,15 @@
}
# Perform the insertion
- db_exec_plsql relate "begin
- :rel_id := content_item.relate (
+ set rel_id [db_exec_plsql relate "begin
+ :1 := content_item.relate (
item_id => :item_id,
object_id => :related_id,
relation_tag => :relation_tag,
order_n => :order_n,
relation_type => :relation_type
);
- end;" rel_id
+ end;"]
# Insert any extra attributes
if { [llength $elements] > 0 } {
Index: openacs-4/packages/cms/www/modules/items/revision-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-upload.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/revision-upload.tcl 25 May 2001 02:15:56 -0000 1.3
+++ openacs-4/packages/cms/www/modules/items/revision-upload.tcl 26 May 2001 19:45:03 -0000 1.4
@@ -97,7 +97,7 @@
ns_log Notice "revision-upload.tcl - Creating content item... $name"
set item_id [db_exec_plsql new_content "begin
- :item_id := content_item.new(
+ :1 := content_item.new(
name => :name,
parent_id => :parent_id,
content_type => :content_type,
@@ -112,11 +112,11 @@
set tmp_filename [ns_queryget xml_file.tmpfile]
set doc [template::util::read_file $tmp_filename]
- db_clob_dml insert_content "insert into cr_xml_docs
- values ($revision_id, empty_clob()) returning doc into :1" $doc
+ db_dml insert_content "insert into cr_xml_docs
+ values ($revision_id, empty_clob()) returning doc into :1" -clobs $doc
set revision_id [db_exec_plsql import_xml "begin
- :revision_id := content_revision.import_xml(
+ :1 := content_revision.import_xml(
:item_id, :revision_id, :revision_id);
end;"]
Index: openacs-4/packages/cms/www/modules/items/template-unregister-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/template-unregister-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/template-unregister-oracle.xql 25 May 2001 04:56:36 -0000 1.1
+++ openacs-4/packages/cms/www/modules/items/template-unregister-oracle.xql 26 May 2001 19:45:03 -0000 1.2
@@ -3,7 +3,7 @@
oracle8.1.6
-
+
begin
content_item.unregister_template(
Index: openacs-4/packages/cms/www/modules/items/template-unregister-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/template-unregister-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/template-unregister-postgresql.xql 25 May 2001 04:56:36 -0000 1.1
+++ openacs-4/packages/cms/www/modules/items/template-unregister-postgresql.xql 26 May 2001 19:45:03 -0000 1.2
@@ -3,7 +3,7 @@
postgresql7.1
-
+
select content_item__unregister_template(
Index: openacs-4/packages/cms/www/modules/items/template-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/template-unregister.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/template-unregister.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/items/template-unregister.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -7,7 +7,7 @@
db_transaction {
- if { [catch { db_exec_plsql template_unregiser "begin
+ if { [catch { db_exec_plsql template_unregister "begin
content_item.unregister_template(
template_id => :template_id,
item_id => :item_id,
Index: openacs-4/packages/cms/www/modules/sitemap/attributes-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/attributes-oracle.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/sitemap/attributes-oracle.xql 26 May 2001 19:45:03 -0000 1.2
@@ -5,10 +5,12 @@
- begin
- $subfolder_sql
- $symlink_sql
+
+ begin
+ content_folder.${subfolder_method}(:folder_resolved_id,'content_folder');
+ content_folder.${symlink_method}(:folder_resolved_id,'content_symlink');
end;
+
Index: openacs-4/packages/cms/www/modules/sitemap/attributes-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/attributes-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/sitemap/attributes-postgresql.xql 26 May 2001 19:45:03 -0000 1.2
@@ -5,14 +5,14 @@
--- FIXME: dynamic sql
- begin
- $subfolder_sql
- $symlink_sql
- return null;
- end;
+ begin
+ PERFORM content_folder__${subfolder_method}(:folder_resolved_id,'content_folder');
+ PERFORM content_folder__${symlink_method}(:folder_resolved_id,'content_symlink');
+ return null;
+ end;
+
Index: openacs-4/packages/cms/www/modules/sitemap/attributes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/attributes.tcl 25 May 2001 02:15:56 -0000 1.2
+++ openacs-4/packages/cms/www/modules/sitemap/attributes.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -101,22 +101,21 @@
if { [string equal $allow_subfolders "t"] } {
- set subfolder_sql "content_folder.register_content_type(:folder_resolved_id,'content_folder');"
+ set subfolder_method "register_content_type"
} else {
- set subfolder_sql "content_folder.unregister_content_type(:folder_resolved_id,'content_folder');"
+ set subfolder_method "unregister_content_type"
}
if { [string equal $allow_symlinks "t"] } {
- set symlink_sql "content_folder.register_content_type(:folder_resolved_id,'content_symlink');"
+ set symlink_method "register_content_type"
} else {
- set symlink_sql "content_folder.unregister_content_type(:folder_resolved_id,'content_symlink');"
+ set symlink_method "unregister_content_type"
}
- set sql
-
- db_exec_plsql content "begin
- $subfolder_sql
- $symlink_sql
+ db_exec_plsql content "
+ begin
+ content_folder.${subfolder_method}(:folder_resolved_id,'content_folder');
+ content_folder.${symlink_method}(:folder_resolved_id,'content_symlink');
end;"
}
Index: openacs-4/packages/cms/www/modules/sitemap/symlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/symlink.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/symlink.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/sitemap/symlink.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -113,7 +113,7 @@
if { [catch {db_exec_plsql new_link "
begin
- :symlink_id := content_symlink.new(
+ :1 := content_symlink.new(
name => :name,
label => :label,
target_id => :sym_item_id,
Index: openacs-4/packages/cms/www/modules/templates/copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/copy.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/templates/copy.tcl 25 May 2001 02:15:56 -0000 1.2
+++ openacs-4/packages/cms/www/modules/templates/copy.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -15,12 +15,14 @@
set creation_ip [ns_conn peeraddr]
foreach template_id [ns_querygetall template_id] {
- db_exec_plsql copy_item "declare copy_id integer; begin
- copy_id := content_item.copy2(
- :template_id, :folder_id, :creation_user, :creation_ip
- );
- insert into cr_templates (template_id) values (copy_id);
- end;"
+ db_exec_plsql copy_item "declare
+ copy_id integer;
+ begin
+ copy_id := content_item.copy2(
+ :template_id, :folder_id, :creation_user, :creation_ip
+ );
+ insert into cr_templates (template_id) values (copy_id);
+ end;"
}
}
}
Index: openacs-4/packages/cms/www/modules/templates/new-folder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-folder.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/templates/new-folder.tcl 25 May 2001 02:15:56 -0000 1.2
+++ openacs-4/packages/cms/www/modules/templates/new-folder.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -41,7 +41,7 @@
db_transaction {
- set folder_id [db_exec_plsql "begin :folder_id := content_folder.new(
+ set folder_id [db_exec_plsql "begin :1 := content_folder.new(
folder_id => :folder_id,
name => :name,
label => :label,
Index: openacs-4/packages/cms/www/modules/templates/template-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-create.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/templates/template-create.tcl 25 May 2001 02:15:56 -0000 1.2
+++ openacs-4/packages/cms/www/modules/templates/template-create.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -49,15 +49,15 @@
db_transaction {
- db_exec_plsql new_template "begin
- :ret_val := content_template.new(
+ set ret_val [db_exec_plsql new_template "begin
+ :1 := content_template.new(
template_id => :template_id,
name => :name,
parent_id => :parent_id,
creation_user => :user_id,
creation_ip => :ip_address
);
- end;" ret_val
+ end;"]
}
template::forward ../templates/template?template_id=$template_id
Index: openacs-4/packages/cms/www/modules/types/relation-register-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/relation-register-oracle.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/types/relation-register-oracle.xql 26 May 2001 19:45:03 -0000 1.2
@@ -18,5 +18,20 @@
-
+
+
+
+ begin
+ content_type.${register_method} (
+ $content_key => :content_type,
+ $target_key => :target_type,
+ relation_tag => :relation_tag,
+ min_n => :min_n,
+ max_n => :max_n
+ );
+ end;
+
+
+
+
Index: openacs-4/packages/cms/www/modules/types/relation-register-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/relation-register-postgresql.xql 25 May 2001 23:49:05 -0000 1.1
+++ openacs-4/packages/cms/www/modules/types/relation-register-postgresql.xql 26 May 2001 19:45:03 -0000 1.2
@@ -18,5 +18,20 @@
+
+
+
+
+ select content_type__${register_method} (
+ :content_type,
+ :target_type,
+ :relation_tag,
+ :min_n,
+ :max_n
+ );
+
+
+
+
Index: openacs-4/packages/cms/www/modules/types/relation-register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/relation-register.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/types/relation-register.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -86,33 +86,28 @@
}
if { [string equal $rel_type item_rel] } {
- set sql "
- begin
- content_type.register_relation_type (
- content_type => :content_type,
- target_type => :target_type,
- relation_tag => :relation_tag,
- min_n => :min_n,
- max_n => :max_n
- );
- end;"
+ set register_method "register_relation_type"
+ set content_key "content_type"
+ set target_key "target_type"
} elseif { [string equal $rel_type child_rel] } {
- set sql "
- begin
- content_type.register_child_type (
- parent_type => :content_type,
- child_type => :target_type,
- relation_tag => :relation_tag,
- min_n => :min_n,
- max_n => :max_n
- );
- end;"
+ set register_method "register_child_type"
+ set content_key "parent_type"
+ set target_key "child_type"
}
db_transaction {
- if { [catch {db_exec_plsql register_rel_types $sql} errmsg] } {
+ if { [catch {db_exec_plsql register_rel_types "
+ begin
+ content_type.${register_method} (
+ $content_key => :content_type,
+ $target_key => :target_type,
+ relation_tag => :relation_tag,
+ min_n => :min_n,
+ max_n => :max_n
+ );
+ end;"} errmsg] } {
template::request::error register_relation_type \
"Could not register relation type - $errmsg"
}
Index: openacs-4/packages/cms/www/modules/types/relation-unregister-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-unregister-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/types/relation-unregister-oracle.xql 26 May 2001 19:45:03 -0000 1.1
@@ -0,0 +1,21 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+
+ begin
+ content_type.${unregister_method} (
+ $content_key => :content_type,
+ $target_key => :target_type,
+ relation_tag => :relation_tag
+ );
+ end;
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/types/relation-unregister-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-unregister-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/types/relation-unregister-postgresql.xql 26 May 2001 19:45:03 -0000 1.1
@@ -0,0 +1,21 @@
+
+
+
+ postgresql7.1
+
+
+
+
+
+
+ select content_type__${unregister_method} (
+ :content_type,
+ :target_type,
+ :relation_tag
+ );
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/types/relation-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-unregister.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/relation-unregister.tcl 24 May 2001 23:57:17 -0000 1.2
+++ openacs-4/packages/cms/www/modules/types/relation-unregister.tcl 26 May 2001 19:45:03 -0000 1.3
@@ -17,33 +17,30 @@
if { [string equal $rel_type child_rel] } {
- set sql "
- begin
- content_type.unregister_child_type(
- parent_type => :content_type,
- child_type => :target_type,
- relation_tag => :relation_tag
- );
- end;"
+ set unregister_method "unregister_child_type"
+ set content_key "parent_type"
+ set target_key "child_type"
} elseif { [string equal $rel_type item_rel] } {
- set sql "
- begin
- content_type.unregister_relation_type(
- content_type => :content_type,
- target_type => :target_type,
- relation_tag => :relation_tag
- );
- end;"
+ set unregister_method "unregister_relation_type"
+ set content_key "content_type"
+ set target_key "target_type"
} else {
# bad rel_type, don't do anything
template::forward "index?id=$content_type"
}
-if { [catch {db_exec_plsql unregister $sql} errmsg] } {
+if { [catch {db_exec_plsql unregister "
+ begin
+ content_type.${unregister_method} (
+ $content_key => :content_type,
+ $target_key => :target_type,
+ relation_tag => :relation_tag
+ );
+ end;"} errmsg] } {
template::request::error unregister_relation_type \
"Could not unregister relation type - $errmsg"
}