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.41.2.53 -r1.41.2.54 --- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 8 Nov 2022 12:47:43 -0000 1.41.2.53 +++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 8 Nov 2022 13:24:15 -0000 1.41.2.54 @@ -807,31 +807,9 @@ } ::xo::Package instproc get_parameter {attribute {default ""}} { - # set package_id ${:id} - # set parameter_obj [::xo::parameter get_parameter_object \ - # -parameter_name $attribute \ - # -package_id $package_id \ - # -retry false] - # set success 0 - - # if {$parameter_obj ne "" && [$parameter_obj set scope] ne "global"} { - # set value [$parameter_obj get -package_id $package_id] - # #ns_log notice "core: get_param for $attribute after GET: [$parameter_obj serialize] -> '$value'" - # #if {$value ne "" || [$parameter_obj set __success]} {return $value} - # # - # # The returned '$value' might be a value set for the actual - # # package instance, or the default for the package_parameter as - # # defined by the package parameter definition in the XML file. If - # # the value was not specified explicitly, and the provided - # # default for this command is not empty, return the provided - # # default. - # # - # if {![$parameter_obj set __success] && $value eq "" && $default ne ""} { - # return $default - # } else { - # return $value - # } - # } + # + # Get value from package parameter (per-instance) + # set value [::parameter::get -package_id ${:id} -parameter $attribute -default $default] if {$value ne $default} { return $value