Index: openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/acs-cache-init.tcl,v diff -u -r1.1.2.5 -r1.1.2.6 --- openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl 14 May 2023 23:08:52 -0000 1.1.2.5 +++ openacs-4/packages/acs-tcl/tcl/acs-cache-init.tcl 14 May 2023 23:14:45 -0000 1.1.2.6 @@ -1,12 +1,10 @@ -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 -} +# +# 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 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.40 -r1.10.2.41 --- openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl 14 May 2023 23:08:52 -0000 1.10.2.40 +++ openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl 14 May 2023 23:14:45 -0000 1.10.2.41 @@ -684,25 +684,7 @@ } } -# 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.13 -r1.26.2.14 --- openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl 14 May 2023 23:08:52 -0000 1.26.2.13 +++ openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl 14 May 2023 23:14:45 -0000 1.26.2.14 @@ -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,7 +179,6 @@ # 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] } @@ -189,7 +188,7 @@ } # 3. use the default value - if {$value eq ""} { + if {$value eq ""} { set value $default } @@ -268,7 +267,6 @@ # 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.