Index: openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl,v diff -u -r1.29 -r1.29.6.1 --- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 11 Aug 2011 13:04:24 -0000 1.29 +++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 11 Feb 2014 11:53:08 -0000 1.29.6.1 @@ -22,7 +22,7 @@ } { my instvar package_key if {[info exists privilege]} { - set sql [::xo::db::sql select -vars package_id \ + set sql [::xo::dc select -vars package_id \ -from "apm_packages, acs_object_party_privilege_map ppm, site_nodes s" \ -where { package_key = :package_key @@ -31,7 +31,7 @@ and ppm.party_id = :party_id and ppm.privilege = :privilege } -limit 1] - db_string [my qn get_package_id] $sql + ::xo::dc get_value get_package_id $sql } else { ::xo::parameter get_package_id_from_package_key -package_key $package_key } @@ -44,10 +44,10 @@ } { my instvar package_key if {$include_unmounted} { - set result [db_list [my qn get_xowiki_packages] {select package_id \ + set result [::xo::dc list get_xowiki_packages {select package_id \ from apm_packages where package_key = :package_key}] } else { - set result [db_list [my qn get_mounted_packages] {select package_id \ + set result [::xo::dc list get_mounted_packages {select package_id \ from apm_packages p, site_nodes s \ where package_key = :package_key and s.object_id = p.package_id}] } @@ -248,7 +248,7 @@ my package_key $info(package_key) my instance_name $info(instance_name) } else { - db_1row [my qn package_info] { + ::xo::dc 1row package_info { select package_key, instance_name from apm_packages where package_id = :id } my package_key $package_key @@ -377,4 +377,11 @@ #ns_log notice [::xo::Package serialize] -} \ No newline at end of file +} + +# +# Local variables: +# mode: tcl +# tcl-indent-level: 2 +# indent-tabs-mode: nil +# End: