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.6.1 -r1.29.6.2 --- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 11 Feb 2014 11:53:08 -0000 1.29.6.1 +++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 14 Feb 2014 18:20:44 -0000 1.29.6.2 @@ -1,4 +1,4 @@ -ad_library { +xad_library { Definition of a package manager for creating XOTcl package objects @author Gustaf Neumann (neumann@wu-wien.ac.at) @@ -31,7 +31,7 @@ and ppm.party_id = :party_id and ppm.privilege = :privilege } -limit 1] - ::xo::dc get_value 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 } @@ -45,17 +45,17 @@ my instvar package_key if {$include_unmounted} { set result [::xo::dc list get_xowiki_packages {select package_id \ - from apm_packages where package_key = :package_key}] + from apm_packages where package_key = :package_key}] } else { 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}] + from apm_packages p, site_nodes s \ + where package_key = :package_key and s.object_id = p.package_id}] } if {$closure} { foreach subclass [my info subclass] { - foreach id [$subclass instances -include_unmounted $include_unmounted -closure true] { - lappend result $id - } + foreach id [$subclass instances -include_unmounted $include_unmounted -closure true] { + lappend result $id + } } } return [lsort -integer $result] @@ -120,7 +120,7 @@ } else { my require -url $url $package_id } - + # # In case the login expired, we can force an early login to # prevent later login redirects, which can cause problems @@ -129,9 +129,9 @@ # might not require the real user_id. # #my msg "force [$package_id force_refresh_login] &&\ - # [::xo::cc set untrusted_user_id] != [::xo::cc user_id]" + # [::xo::cc set untrusted_user_id] != [::xo::cc user_id]" if {[$package_id force_refresh_login] && - [::xo::cc set untrusted_user_id] != [::xo::cc user_id]} { + [::xo::cc set untrusted_user_id] != [::xo::cc user_id]} { auth::require_login } @@ -201,7 +201,7 @@ # # get apm_package class #### missing in acs_attributes: instance_name, default_locale #::xo::db::Class get_class_from_db -object_type apm_package - + #ns_log notice [::xo::db::apm_package serialize] #ns_log notice ======================================= @@ -219,7 +219,7 @@ url {context ::xo::cc} package_url - {force_refresh_login false} + {force_refresh_login false} } ::xo::Package instforward query_parameter {%my set context} %proc @@ -237,7 +237,7 @@ #my log "--get_parameter <$attribute> <$default> returned <$param>" return $param } - + ::xo::Package instproc init args { my instvar id url set package_url [lindex [site_node::get_url_from_object_id -object_id $id] 0] @@ -333,7 +333,7 @@ eval [::xo::cc set __continuation] } else { if {[string length $text] > 1} { - set status_code [expr {[::xo::cc exists status_code] ? [::xo::cc set status_code] : 200}] + set status_code [expr {[::xo::cc exists status_code] ? [::xo::cc set status_code] : 200}] #my log "REPLY [my set delivery] 200 [my set mime_type]" [my set delivery] $status_code [my set mime_type] $text } @@ -374,7 +374,7 @@ #my log "--after adp" return $text } - + #ns_log notice [::xo::Package serialize] }