Index: openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl 20 Jul 2022 11:50:31 -0000 1.1.2.4 +++ openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl 14 May 2023 23:08:52 -0000 1.1.2.5 @@ -1,10 +1,12 @@ -# -# The acs::misc_cache is a potential successor of the util_memoize_cache, -# but in a partitioned fashion to make it scalable. It should only be -# used for situation, where not wild-card flushes are required. -# -set cacheType [expr {[::acs::icanuse "ns_hash"] ? "HashKeyPartitionedCache" : "Cache"}] -::acs::$cacheType create ::acs::misc_cache \ - -package_key acs-tcl \ - -parameter MiscCache \ - -default_size 100KB +if {[info commands ::acs::misc_cache] eq ""} { + # + # The acs::misc_cache is a potential successor of the util_memoize_cache, + # but in a partitioned fashion to make it scalable. It should only be + # used for situation, where no wild-card flushes are required. + # + set cacheType [expr {[::acs::icanuse "ns_hash"] ? "HashKeyPartitionedCache" : "Cache"}] + ::acs::$cacheType create ::acs::misc_cache \ + -package_key acs-tcl \ + -parameter MiscCache \ + -default_size 100KB +} Index: openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl,v diff -u -r1.10.2.39 -r1.10.2.40 --- openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl 27 Feb 2023 17:57:44 -0000 1.10.2.39 +++ openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl 14 May 2023 23:08:52 -0000 1.10.2.40 @@ -684,7 +684,25 @@ } } +# if {[info commands ::acs::misc_cache] eq ""} { +# if {[info commands ::parameter::get_from_package_key] eq ""} { +# namespace eval ::parameter {} +# ad_proc ::parameter::get_from_package_key { +# -package_key +# -parameter:required +# {-default ""} +# } { +# return $default +# } +# } +# set cacheType [expr {[::acs::icanuse "ns_hash"] ? "HashKeyPartitionedCache" : "Cache"}] +# ::acs::$cacheType create ::acs::misc_cache \ +# -package_key acs-tcl \ +# -parameter MiscCache \ +# -default_size 100KB +# } + # Local variables: # mode: tcl # tcl-indent-level: 4 Index: openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl,v diff -u -r1.26.2.12 -r1.26.2.13 --- openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl 29 Sep 2022 16:10:37 -0000 1.26.2.12 +++ openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl 14 May 2023 23:08:52 -0000 1.26.2.13 @@ -43,10 +43,10 @@ db_exec_plsql set_parameter_value {} - # ::acs::dc call apm set_value \ - # -package_key $package_key \ - # -parameter $parameter \ - # -attr_value $value + #acs::dc call apm set_value \ + # -package_key $package_key \ + # -parameter $parameter \ + # -attr_value $value acs::clusterwide callback subsite::global_parameter_changed \ -package_key $package_key \ @@ -134,7 +134,7 @@ # db_exec_plsql set_parameter_value {} - #::acs::dc call apm set_value \ + #acs::dc call apm set_value \ # -package_id $package_id \ # -parameter_name $parameter \ # -attr_value $value @@ -179,6 +179,7 @@ # if {$package_id ne ""} { set package_key [apm_package_key_from_id $package_id] + #set value [ad_parameter_from_file $parameter $package_key $default] set value [ad_parameter_from_file $parameter $package_key] } @@ -188,7 +189,7 @@ } # 3. use the default value - if {$value eq ""} { + if {$value eq ""} { set value $default } @@ -267,6 +268,7 @@ # configuration file; this value has highest precedence. # set value [ad_parameter_from_file $parameter $package_key] + #set value [ad_parameter_from_file $parameter $package_key] # # 2. Try to get the value from a global package parameter. Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v diff -u -r1.126.2.89 -r1.126.2.90 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 14 May 2023 22:18:07 -0000 1.126.2.89 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 14 May 2023 23:08:53 -0000 1.126.2.90 @@ -1452,20 +1452,22 @@ -package_id $subsite_id \ -default *] set result {} - foreach auth_obj [::xo::Authorize info instances -closure] { - # - # Don't list on the general available pages the external - # authorization objects when these are configured in debugging - # mode. - # - if {[$auth_obj cget -debug]} { - continue - } + if {[nsf::is object ::xo::Authorize]} { + foreach auth_obj [::xo::Authorize info instances -closure] { + # + # Don't list on the general available pages the external + # authorization objects when these are configured in debugging + # mode. + # + if {[$auth_obj cget -debug]} { + continue + } - if {$offered_registries eq "*" - || $auth_obj in $offered_registries - } { - lappend result $auth_obj + if {$offered_registries eq "*" + || $auth_obj in $offered_registries + } { + lappend result $auth_obj + } } } return $result