Index: openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl,v diff -u -N -r1.4.2.6 -r1.4.2.7 --- openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl 20 Sep 2022 08:54:37 -0000 1.4.2.6 +++ openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl 17 Jan 2023 10:24:00 -0000 1.4.2.7 @@ -76,7 +76,7 @@ xowiki_admin_portlet proc install {} { :log "--portlet calling [self proc]" set name [:name] - db_transaction { + ::xo::dc transaction { # # create the datasource @@ -151,14 +151,14 @@ # completely identical to "xowiki_portlet uninstall" # set name [:name] - db_transaction { + ::xo::dc transaction { # # get the datasource # - set ds_id [db_string dbqd..get_ds_id { + set ds_id [::xo::dc get_value get_ds_id { select datasource_id from portal_datasources where name = :name - } -default "0"] + } 0] if {$ds_id != 0} { # Index: openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl,v diff -u -N -r1.3.6.6 -r1.3.6.7 --- openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl 20 Sep 2022 08:54:37 -0000 1.3.6.6 +++ openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl 17 Jan 2023 10:24:00 -0000 1.3.6.7 @@ -73,7 +73,7 @@ # # create the datasource # - db_transaction { + ::xo::dc transaction { set ds_id [portal::datasource::new \ -name $name \ -description "Displays an xowiki page as a portlet"] @@ -151,13 +151,13 @@ # set name [:name] - db_transaction { + ::xo::dc transaction { # # get the datasource # - set ds_id [db_string dbqd..get_ds_id { + set ds_id [::xo::dc get_value get_ds_id { select datasource_id from portal_datasources where name = :name - } -default "0"] + } 0] if {$ds_id != 0} { # Index: openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl,v diff -u -N -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl 7 Feb 2020 08:44:05 -0000 1.10.2.1 +++ openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl 17 Jan 2023 10:24:00 -0000 1.10.2.2 @@ -40,19 +40,20 @@ -parameter xowiki_admin_portlet_element_pretty_name \ -default [_ xowiki-portlet.admin_portlet_element_pretty_name]] -db_multirow content select_content \ - "select m.element_id, m.pretty_name, pep.value as name +::xo::dc multirow -prepare integer content select_content [subst { + select m.element_id, m.pretty_name, pep.value as name from portal_element_map m, portal_pages p, portal_element_parameters pep where m.page_id = p.page_id - and p.portal_id = $template_portal_id + and p.portal_id = :template_portal_id and m.datasource_id = [portal::get_datasource_id [xowiki_portlet name]] - and pep.element_id = m.element_id and pep.key = 'page_name'" {} + and pep.element_id = m.element_id and pep.key = 'page_name' +}] # don't ask to insert same page twice template::multirow foreach content {set used_page_id($name) 1} set options "" -db_foreach instance_select \ +::xo::dc foreach instance_select \ [::xowiki::Page instance_select_query \ -folder_id [::$xowiki_package_id folder_id] \ -with_subtypes true \ Index: openacs-4/packages/xowiki/lib/portlets/weblog-mini-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/lib/portlets/Attic/weblog-mini-calendar.tcl,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/xowiki/lib/portlets/weblog-mini-calendar.tcl 19 Aug 2022 19:35:17 -0000 1.1.2.1 +++ openacs-4/packages/xowiki/lib/portlets/weblog-mini-calendar.tcl 17 Jan 2023 10:33:56 -0000 1.1.2.2 @@ -68,7 +68,7 @@ and ci.item_id != :including_item_id \ and ci.publish_status <> 'production' " -xo::dc foreach entries_this_month "select count(ci.item_id) as c, +::xo::dc foreach entries_this_month "select count(ci.item_id) as c, [::xo::dc date_trunc day p.publish_date] as d \ $innersql and [::xo::dc date_trunc_expression month p.publish_date :date_reference] \ @@ -87,7 +87,7 @@ # # Compute the available time range # -set dates [db_list_of_lists get_dates "select min([::xo::dc date_trunc day p.publish_date]),max([::xo::dc date_trunc day p.publish_date]) $innersql"] +set dates [::xo::dc list_of_lists get_dates "select min([::xo::dc date_trunc day p.publish_date]),max([::xo::dc date_trunc day p.publish_date]) $innersql"] set earliest_date [::xo::db::tcl_date [lindex $dates 0 0] _] set latest_date [::xo::db::tcl_date [lindex $dates 0 end] _] Index: openacs-4/packages/xowiki/tcl/dotlrn-portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/dotlrn-portal-procs.tcl,v diff -u -N -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/xowiki/tcl/dotlrn-portal-procs.tcl 21 Sep 2019 19:03:21 -0000 1.1.2.3 +++ openacs-4/packages/xowiki/tcl/dotlrn-portal-procs.tcl 17 Jan 2023 10:33:56 -0000 1.1.2.4 @@ -87,7 +87,7 @@ # we have no community_id, get all :community ids, case (4) # set user_id [::xo::cc user_id] - set community_ids [db_list get_memberships { + set community_ids [::xo::dc list -prepare integer get_memberships { select community_id from dotlrn_member_rels_approved where user_id = :user_id Index: openacs-4/packages/xowiki/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v diff -u -N -r1.31.2.6 -r1.31.2.7 --- openacs-4/packages/xowiki/www/admin/index.tcl 28 Oct 2022 18:14:58 -0000 1.31.2.6 +++ openacs-4/packages/xowiki/www/admin/index.tcl 17 Jan 2023 10:33:56 -0000 1.31.2.7 @@ -64,7 +64,7 @@ set add_title "" set add_href "" set pretty_plural [$object_type pretty_plural] - if {[catch {set n [db_list count [$object_type instance_select_query \ + if {[catch {set n [::xo::dc list count [$object_type instance_select_query \ -folder_id [::$package_id set folder_id] \ -count 1 -with_subtypes false]]}]} { set n - Index: openacs-4/packages/xowiki/www/admin/portal-element-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/portal-element-add.tcl,v diff -u -N -r1.17.2.4 -r1.17.2.5 --- openacs-4/packages/xowiki/www/admin/portal-element-add.tcl 15 Oct 2020 08:50:43 -0000 1.17.2.4 +++ openacs-4/packages/xowiki/www/admin/portal-element-add.tcl 17 Jan 2023 10:33:56 -0000 1.17.2.5 @@ -32,7 +32,7 @@ # for the time being, we add the portlet on the first page (page 0) set portal_page_id [portal::get_page_id -portal_id $portal_id -sort_key 0] - if {[xo::dc get_value check_unique_name_on_page { + if {[::xo::dc get_value -prepare integer,text check_unique_name_on_page { select 1 from portal_element_map where page_id = :portal_page_id and pretty_name = :page_title @@ -48,7 +48,7 @@ # # everything ok, add the portal element # - db_transaction { + ::xo::dc transaction { set element_id [portal::add_element \ -portal_id $portal_id \ -portlet_name [xowiki_portlet name] \ Index: openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.tcl,v diff -u -N -r1.8.2.4 -r1.8.2.5 --- openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.tcl 6 Oct 2022 15:40:30 -0000 1.8.2.4 +++ openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.tcl 17 Jan 2023 10:33:56 -0000 1.8.2.5 @@ -8,7 +8,7 @@ set return_url [export_vars -base [ad_conn url] -no_empty {parent_id}] -db_multirow -extend { +::xo::dc multirow -prepare integer -extend { delete_url download_url img_id