Index: openacs-4/packages/acs-content-repository/tcl/content-folder-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-folder-procs.tcl,v diff -u -N -r1.15.2.1 -r1.15.2.2 --- openacs-4/packages/acs-content-repository/tcl/content-folder-procs.tcl 10 Sep 2015 08:21:16 -0000 1.15.2.1 +++ openacs-4/packages/acs-content-repository/tcl/content-folder-procs.tcl 2 Jan 2016 21:24:46 -0000 1.15.2.2 @@ -335,7 +335,9 @@ Returns the folder_id of the package instance } { - return [db_string get_folder_id "select folder_id from cr_folders where package_id=:package_id"] + return [db_string get_folder_id { + select folder_id from cr_folders where package_id = :package_id + }] } # Local variables: Index: openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl,v diff -u -N -r1.24 -r1.24.2.1 --- openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl 27 Apr 2015 15:28:16 -0000 1.24 +++ openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl 2 Jan 2016 21:24:46 -0000 1.24.2.1 @@ -240,12 +240,16 @@ if {"content_folder" eq $content_type} { return [db_0or1row get_item_folder "" -column_array local_array] } - set table_name [db_string get_table_name "select table_name from acs_object_types where object_type=:content_type"] + set table_name [db_string get_table_name { + select table_name from acs_object_types where object_type = :content_type + }] while {$table_name eq ""} { acs_object_type::get -object_type $content_type -array typeInfo ns_log notice "no table for $content_type registered, trying '$typeInfo(supertype)' instead" set content_type $typeInfo(supertype) - set table_name [db_string get_table_name "select table_name from acs_object_types where object_type=:content_type"] + set table_name [db_string get_table_name { + select table_name from acs_object_types where object_type = :content_type + }] } set table_name "${table_name}x" # get attributes of the content_item use the content_typex view @@ -899,8 +903,9 @@ } { - set publish_status [db_string gps_get_publish_status \ - "select publish_status from cr_items where item_id = :item_id"] + set publish_status [db_string gps_get_publish_status { + select publish_status from cr_items where item_id = :item_id + }] return $publish_status } Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs-postgresql.xql,v diff -u -N -r1.5 -r1.5.14.1 --- openacs-4/packages/acs-content-repository/tcl/content-revision-procs-postgresql.xql 27 Aug 2006 20:34:37 -0000 1.5 +++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs-postgresql.xql 2 Jan 2016 21:24:47 -0000 1.5.14.1 @@ -34,7 +34,7 @@ update cr_revisions set mime_type = :mime_type, - lob = [set __lob_id [db_string get_lob_id "select empty_lob()"]] + lob = [set __lob_id [db_string get_lob_id {select empty_lob()}]] where revision_id = :revision_id Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v diff -u -N -r1.26.2.1 -r1.26.2.2 --- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 10 Sep 2015 08:21:17 -0000 1.26.2.1 +++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 2 Jan 2016 21:24:47 -0000 1.26.2.2 @@ -131,7 +131,9 @@ } } - set table_name [db_string get_table_name "select table_name from acs_object_types where object_type=:content_type"] + set table_name [db_string get_table_name { + select table_name from acs_object_types where object_type = :content_type + }] set query_text "insert into ${table_name}i (revision_id, object_type, creation_user, creation_date, creation_ip, title, description, item_id, object_package_id, mime_type $attribute_names) Index: openacs-4/packages/acs-content-repository/tcl/image-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/image-procs.tcl,v diff -u -N -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/acs-content-repository/tcl/image-procs.tcl 10 Sep 2015 08:21:18 -0000 1.11.2.1 +++ openacs-4/packages/acs-content-repository/tcl/image-procs.tcl 2 Jan 2016 21:24:47 -0000 1.11.2.2 @@ -423,7 +423,10 @@ } { foreach {size_name dimensions} [image::get_convert_to_sizes] { - foreach item_id [db_list get_items "select item_id from cr_items where \content_type='image' and latest_revision is not null"] { + foreach item_id [db_list get_items { + select item_id from cr_items + where content_type='image' and latest_revision is not null + }] { image::resize \ -item_id $item_id \ -size_name $size_name Index: openacs-4/packages/acs-content-repository/tcl/revision-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs-postgresql.xql,v diff -u -N -r1.10 -r1.10.18.1 --- openacs-4/packages/acs-content-repository/tcl/revision-procs-postgresql.xql 20 Apr 2004 21:12:37 -0000 1.10 +++ openacs-4/packages/acs-content-repository/tcl/revision-procs-postgresql.xql 2 Jan 2016 21:24:47 -0000 1.10.18.1 @@ -135,7 +135,7 @@ update cr_revisions set mime_type = :mime_type, - lob = [set __lob_id [db_string get_lob_id "select empty_lob()"]] + lob = [set __lob_id [db_string get_lob_id {select empty_lob()}]] where revision_id = :revision_id Index: openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl,v diff -u -N -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl 10 Sep 2015 08:21:19 -0000 1.10.2.1 +++ openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl 2 Jan 2016 21:24:47 -0000 1.10.2.2 @@ -67,7 +67,10 @@ aa_true "First item's revision exists" \ [expr \ {![string equal "" \ - [db_string get_revision "select latest_revision from cr_items, cr_revisions where latest_revision=revision_id and cr_items.item_id=:first_item_id" -default ""]]}] + [db_string get_revision { + select latest_revision from cr_items, cr_revisions + where latest_revision=revision_id and cr_items.item_id = :first_item_id + } -default ""]]}] # check the folder is not empty now. set is_empty [content::folder::is_empty -folder_id $first_folder_id] Index: openacs-4/packages/acs-content-repository/tcl/test/content-search-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-search-procs.tcl,v diff -u -N -r1.3.12.1 -r1.3.12.2 --- openacs-4/packages/acs-content-repository/tcl/test/content-search-procs.tcl 10 Sep 2015 08:21:19 -0000 1.3.12.1 +++ openacs-4/packages/acs-content-repository/tcl/test/content-search-procs.tcl 2 Jan 2016 21:24:47 -0000 1.3.12.2 @@ -12,12 +12,12 @@ Check if revision_id is in the search observer queue } { aa_false "Revision ${revision_id} is not queued for search events $events" \ - [expr [db_string check_queue \ - "select count(*) from search_observer_queue - where object_id=:revision_id - and event in - ([template::util::tcl_to_sql_list $events])"\ - -default 0]] + [expr [db_string check_queue [subst { + select count(*) from search_observer_queue + where object_id = :revision_id + and event in + ([template::util::tcl_to_sql_list $events]) + }] -default 0]] } ad_proc -private cr_item_search::assert_in_queue { @@ -30,12 +30,12 @@ @param events List of events to check for (INSERT,UPDATE,DELETE) } { aa_true "Revision ${revision_id} is queued for search events $events" \ - [expr [db_string check_queue \ - "select count(*) from search_observer_queue - where object_id=:revision_id - and event in - ([template::util::tcl_to_sql_list $events])"\ - -default 0]] + [expr [db_string check_queue [subst { + select count(*) from search_observer_queue + where object_id = :revision_id + and event in + ([template::util::tcl_to_sql_list $events]) + }] -default 0]] } ad_proc -private cr_item_search::remove_from_queue { @@ -88,10 +88,10 @@ [content::item::get_latest_revision \ -item_id $item_id]] ne ""}] aa_false "Item is NOT queued for search indexing" \ - [expr [db_string check_queue \ - "select 1 from search_observer_queue - where object_id=:latest_revision"\ - -default 0]] + [expr [db_string check_queue { + select 1 from search_observer_queue + where object_id = :latest_revision + } -default 0]] aa_log "Update Item, still no live revision" content::item::update \ -item_id $item_id \ Index: openacs-4/packages/acs-content-repository/www/doc/tutorial.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/tutorial.html,v diff -u -N -r1.2 -r1.2.4.1 --- openacs-4/packages/acs-content-repository/www/doc/tutorial.html 30 Mar 2013 20:02:44 -0000 1.2 +++ openacs-4/packages/acs-content-repository/www/doc/tutorial.html 2 Jan 2016 21:24:47 -0000 1.2.4.1 @@ -701,7 +701,7 @@
Get latest revision (Tcl) -set live_revision_id [db_exec_plsql get_live_revision "select content_item__get_live_revision(:item_id)"] +set live_revision_id [db_exec_plsql get_live_revision {select content_item__get_live_revision(:item_id)}]
Get latest revision (pl/sql) Index: openacs-4/packages/acs-content-repository/www/doc/guide/publish.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/publish.adp,v diff -u -N -r1.2.2.3 -r1.2.2.4 --- openacs-4/packages/acs-content-repository/www/doc/guide/publish.adp 1 Dec 2015 11:17:41 -0000 1.2.2.3 +++ openacs-4/packages/acs-content-repository/www/doc/guide/publish.adp 2 Jan 2016 21:24:47 -0000 1.2.2.4 @@ -36,9 +36,9 @@ # Get the IDs set content_root \ - [db_string content_root "select content_item.get_root_folder from dual"] + [db_string content_root {select content_item.get_root_folder from dual}] set template_root \ - [db_string template_root "select content_template.get_root_folder from dual"] + [db_string template_root {select content_template.get_root_folder from dual}] # Serve the page # DRB: Note that content::init modifies the local variable the_root, which is treated Index: openacs-4/packages/acs-content-repository/www/doc/guide/publish.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/publish.html,v diff -u -N -r1.4 -r1.4.4.1 --- openacs-4/packages/acs-content-repository/www/doc/guide/publish.html 12 Apr 2013 16:12:56 -0000 1.4 +++ openacs-4/packages/acs-content-repository/www/doc/guide/publish.html 2 Jan 2016 21:24:47 -0000 1.4.4.1 @@ -47,9 +47,9 @@ # Get the IDs set content_root \ - [db_string content_root "select content_item.get_root_folder from dual"] + [db_string content_root {select content_item.get_root_folder from dual}] set template_root \ - [db_string template_root "select content_template.get_root_folder from dual"] + [db_string template_root {select content_template.get_root_folder from dual}] # Serve the page # DRB: Note that content::init modifies the local variable the_root, which is treated