Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -N -r1.146 -r1.147 --- openacs-4/packages/xowiki/xowiki.info 13 Sep 2012 16:05:26 -0000 1.146 +++ openacs-4/packages/xowiki/xowiki.info 11 Apr 2013 12:56:23 -0000 1.147 @@ -10,7 +10,7 @@ t xowiki - + Gustaf Neumann A xotcl-based enterprise wiki wiki system with different object types based on the content OpenACS repository @@ -56,12 +56,12 @@ BSD-Style 0 - + - + Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v diff -u -N -r1.22 -r1.23 --- openacs-4/packages/xowiki/tcl/folder-procs.tcl 29 Mar 2013 16:38:13 -0000 1.22 +++ openacs-4/packages/xowiki/tcl/folder-procs.tcl 11 Apr 2013 12:56:23 -0000 1.23 @@ -103,7 +103,7 @@ set target [$l get_target_from_link_page] # the following clause needs an oracle counter-part - set tree_sortkey [db_string [my qn get_tree_sort_key] \ + set tree_sortkey [::xo::db_string get_tree_sort_key \ "select tree_sortkey from acs_objects where object_id = [$target item_id]"] set extra_where "and bt.item_id in (select object_id from acs_objects \ where tree_sortkey between '$tree_sortkey' and tree_right('$tree_sortkey') \ Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -N -r1.232 -r1.233 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 4 Apr 2013 16:07:18 -0000 1.232 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 11 Apr 2013 12:56:23 -0000 1.233 @@ -1332,7 +1332,7 @@ -extend_slot validator party_id_check party_id instproc check=party_id_check {value} { if {$value eq ""} {return 1} - return [db_0or1row [my qn check_party] "select 1 from parties where party_id = :value"] + return [::xo::db_0or1row check_party {select 1 from parties where party_id = :value}] } ########################################################### @@ -2189,8 +2189,8 @@ # We should support as well user level instance attributes. set entry_label [string trimleft $entry_label _] - db_1row [my qn [self proc]] "select $entry_label from cr_items ci, cr_revisions cr - where cr.revision_id = ci.live_revision and ci.item_id = $item_id" + ::xo::db_1row [self proc] "select $entry_label from cr_items ci, cr_revisions cr + where cr.revision_id = ci.live_revision and ci.item_id = :item_id" return [set $entry_label] } abstract_page instproc get_entry_label {value} { Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v diff -u -N -r1.185 -r1.186 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 21 Dec 2012 11:20:35 -0000 1.185 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 11 Apr 2013 12:56:23 -0000 1.186 @@ -286,7 +286,7 @@ -limit $limit -offset $offset] if {$count} { - return [db_string [my qn count_listing] $sql] + return [::xo::db_string count_listing $sql] } else { set s [::xowiki::Page instantiate_objects -sql $sql] return $s @@ -1591,7 +1591,7 @@ where reference=$item_id and ci.item_id = page and ci.item_id = o.object_id" { if {$pid eq ""} { # in version less then oacs 5.2, this returns empty - set pid [db_string _ "select package_id from cr_folders where folder_id = :parent_id"] + set pid [::xo::db_string _ {select package_id from cr_folders where folder_id = :parent_id}] } if {$pid ne ""} { ::xowiki::Package require $pid @@ -1636,7 +1636,7 @@ where page=$item_id and ci.item_id = reference and ci.item_id = o.object_id" { if {$pid eq ""} { # in version less then oacs 5.2, this returns empty - set pid [db_string _ "select package_id from cr_folders where folder_id = :parent_id"] + set pid [::xo::db_string _ {select package_id from cr_folders where folder_id = :parent_id}] } if {$pid ne ""} { ::xowiki::Package require $pid @@ -1712,7 +1712,7 @@ set output "" if {$summary} { - set count [db_string [my qn presence_count_users] \ + set count [::xo::db_string presence_count_users \ "select count(distinct user_id) from xowiki_last_visited WHERE $where_clause"] } else { set values [db_list_of_lists [my qn get_users] \ @@ -1726,7 +1726,7 @@ set count [llength $values] if {$count == $max_users} { # we have to check, whether there were more users... - set count [db_string [my qn presence_count_users] \ + set count [::xo::db_string presence_count_users \ "select count(distinct user_id) from xowiki_last_visited WHERE $where_clause"] } foreach value $values { Index: openacs-4/packages/xowiki/tcl/notification-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/notification-procs.tcl,v diff -u -N -r1.18 -r1.19 --- openacs-4/packages/xowiki/tcl/notification-procs.tcl 13 Sep 2012 16:05:28 -0000 1.18 +++ openacs-4/packages/xowiki/tcl/notification-procs.tcl 11 Apr 2013 12:56:23 -0000 1.19 @@ -62,11 +62,11 @@ namespace eval ::xowiki::notification { ad_proc -private get_url {id} { - if {[db_0or1row is_package_id "select 1 from apm_packages where package_id = $id"]} { + if {[::xo::db_0or1row is_package_id {select 1 from apm_packages where package_id = :id}]} { # # the specified id is an package_id # - set node_id [db_string get_node_id "select node_id from site_nodes where object_id = $id"] + set node_id [::xo::db_string get_node_id {select node_id from site_nodes where object_id = :id}] set url [site_node::get_url -node_id $node_id] return $url } Index: openacs-4/packages/xowiki/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v diff -u -N -r1.269 -r1.270 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 9 Apr 2013 08:46:17 -0000 1.269 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 11 Apr 2013 12:56:23 -0000 1.270 @@ -35,7 +35,7 @@ } else { error "Either item_id or revision_id must be provided" } - return [db_string [my qn get_pid] "select package_id from acs_objects where object_id = :object_id"] + return [::xo::db_string get_pid {select package_id from acs_objects where object_id = :object_id}] } Package ad_proc instantiate_page_from_id { @@ -1965,9 +1965,10 @@ -parameter include_in_google_sitemap_index -default 1]} { continue } - set last_modified [db_string [my qn get_newest_modification_date] \ - "select last_modified from acs_objects where package_id = $package_id \ - order by last_modified desc limit 1"] + set last_modified [::xo::db_string get_newest_modification_date \ + {select last_modified from acs_objects + where package_id = :package_id + order by last_modified desc limit 1}] set time [::xo::db::tcl_date $last_modified tz] set time "[clock format [clock scan $time] -format {%Y-%m-%dT%T}]${tz}:00" Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v diff -u -N -r1.60 -r1.61 --- openacs-4/packages/xowiki/tcl/weblog-procs.tcl 13 Sep 2012 16:05:28 -0000 1.60 +++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl 11 Apr 2013 12:56:23 -0000 1.61 @@ -190,10 +190,9 @@ lappend sql -page_number $page_number -page_size $page_size } - set nr_items [db_string [my qn count] [eval $base_type instance_select_query $sql -count true]] + set nr_items [::xo::db_string count [$base_type instance_select_query {*}$sql -count true]] #my msg count=$nr_items - #my ds [eval $base_type instance_select_query $sql] - set s [$base_type instantiate_objects -sql [eval $base_type instance_select_query $sql]] + set s [$base_type instantiate_objects -sql [$base_type instance_select_query {*}$sql]] foreach c [$s children] { $c instvar revision_id publish_date title name item_id creator creation_user \ Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v diff -u -N -r1.71 -r1.72 --- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 2 Apr 2013 10:43:17 -0000 1.71 +++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 11 Apr 2013 12:56:24 -0000 1.72 @@ -39,7 +39,9 @@ set root_folder_id [::xo::db::CrClass lookup -name "xowiki: $package_id" -parent_id -100] if {$root_folder_id ne "0"} { # we deal with a correctly installed package - if {[db_0or1row is_transformed_folder "select 1 from cr_folders where folder_id = $root_folder_id"]} { + if {[::xo::db_0or1row is_transformed_folder { + select 1 from cr_folders where folder_id = :root_folder_id} + ]} { ::xo::db::sql::content_folder delete -folder_id $root_folder_id -cascade_p 1 } else { ::xo::db::sql::content_item delete -item_id $root_folder_id Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v diff -u -N -r1.130 -r1.131 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 25 Sep 2012 20:50:06 -0000 1.130 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 11 Apr 2013 12:56:24 -0000 1.131 @@ -501,8 +501,9 @@ $data set upload_file $upload_file $data set import_file [$data form_parameter upload_file.tmpfile] set mime_type [$data form_parameter upload_file.content-type] - if {[db_0or1row [my qn check_mimetype] {select 1 from cr_mime_types - where mime_type = :mime_type}] == 0 + if {[::xo::db_0or1row check_mimetype { + select 1 from cr_mime_types where mime_type = :mime_type + }] == 0 || $mime_type eq "application/octet-stream" || $mime_type eq "application/force-download"} { set guessed_mime_type [::xowiki::guesstype $upload_file] Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -N -r1.466 -r1.467 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 11 Apr 2013 11:41:29 -0000 1.466 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 11 Apr 2013 12:56:24 -0000 1.467 @@ -213,9 +213,9 @@ ::xotcl::Object create autoname autoname proc generate {-parent_id -name} { db_transaction { - set already_recorded [db_0or1row [my qn autoname_query] " - select count from xowiki_autonames - where parent_id = :parent_id and name = :name"] + set already_recorded [::xo::db_0or1row autoname_query { + select count from xowiki_autonames + where parent_id = :parent_id and name = :name}] if {$already_recorded} { incr count @@ -1710,9 +1710,9 @@ set description [ad_html_text_convert -from text/html -to text/plain -- $content] } if {$description eq "" && $revision_id > 0} { - set body [db_string [my qn get_description_from_syndication] \ - "select body from syndication where object_id = $revision_id" \ - -default ""] + set body [::xo::db_string get_description_from_syndication \ + "select body from syndication where object_id = $revision_id" \ + -default ""] set description [ad_html_text_convert -from text/html -to text/plain -- $body] } if {[info exists nr_chars] && [string length $description] > $nr_chars} { @@ -2231,7 +2231,7 @@ if {![my exists full_file_name]} { if {[my exists item_id]} { my instvar text mime_type package_id item_id revision_id - set storage_area_key [db_string [my qn get_storage_key] \ + set storage_area_key [::xo::db_string get_storage_key \ "select storage_area_key from cr_items where item_id=$item_id"] my set full_file_name [cr_fs_path $storage_area_key]/$text #my log "--F setting FILE=[my set full_file_name]" @@ -2424,7 +2424,7 @@ } else { set parent_id_clause "" } - set count [db_string [my qn count_usages] \ + set count [::xo::db_string [my qn count_usages] \ "select count(page_instance_id) from $bt, cr_items i \ where page_template = $item_id \ $publish_status_clause $package_clause $parent_id_clause \ Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl 9 Apr 2013 12:17:12 -0000 1.26 +++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl 11 Apr 2013 12:56:24 -0000 1.27 @@ -284,9 +284,10 @@ proc ::xowiki::page_order_uses_ltree {} { if {[::xo::db::has_ltree]} { ns_cache eval xotcl_object_cache ::xowiki::page_order_uses_ltree { - return [db_string check_po_ltree "select count(*) from pg_attribute a, pg_type t, pg_class c \ - where attname = 'page_order' and a.atttypid = t.oid and c.oid = a.attrelid \ - and relname = 'xowiki_page'"] + return [::xo::db_string check_po_ltree { + select count(*) from pg_attribute a, pg_type t, pg_class c + where attname = 'page_order' and a.atttypid = t.oid and c.oid = a.attrelid + and relname = 'xowiki_page'] } } else { return 0 @@ -300,8 +301,9 @@ ::xo::clusterwide ns_cache flush xotcl_object_type_cache $item_id set form_id [::xowiki::Weblog instantiate_forms -forms en:folder.form -package_id $package_id] - if {[db_0or1row check \ - "select 1 from cr_items where content_type = '::xowiki::FormPage' and item_id = $item_id"]} { + if {[::xo::db_0or1row check { + select 1 from cr_items where content_type = '::xowiki::FormPage' and item_id = :item_id + }]} { ns_log notice "folder $item_id is already converted" set f [FormPage get_instance_from_db -item_id $item_id] if {[$f page_template] != $form_id} { @@ -568,7 +570,7 @@ if {[ns_info name] eq "NaviServer"} { my proc urlencode {string} {ns_urlencode $string} } else { - set ue_map [list] + set ue_map [list] for {set i 0} {$i < 256} {incr i} { set c [format %c $i] set x %[format %02x $i] Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -N -r1.314 -r1.315 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 21 Mar 2013 21:14:28 -0000 1.314 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 11 Apr 2013 12:56:24 -0000 1.315 @@ -298,15 +298,17 @@ Page instproc delete-revision {} { my instvar revision_id package_id item_id - db_1row [my qn get_revision] "select latest_revision,live_revision from cr_items where item_id = $item_id" + ::xo::db_1row get_revision { + select latest_revision,live_revision from cr_items where item_id = :item_id + } # do real deletion via package $package_id delete_revision -revision_id $revision_id -item_id $item_id # Take care about UI specific stuff.... set redirect [my query_parameter "return_url" \ [export_vars -base [$package_id url] {{m revisions}}]] if {$live_revision == $revision_id} { # latest revision might have changed by delete_revision, so we have to fetch here - db_1row [my qn get_revision] "select latest_revision from cr_items where item_id = $item_id" + xo::db_1row [my qn get_revision] "select latest_revision from cr_items where item_id = $item_id" if {$latest_revision eq ""} { # we are out of luck, this was the final revision, delete the item my instvar package_id name