Index: openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl,v diff -u -N -r1.6.2.4 -r1.6.2.5 --- openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl 20 Jun 2008 08:25:42 -0000 1.6.2.4 +++ openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl 21 Nov 2008 13:26:32 -0000 1.6.2.5 @@ -163,7 +163,8 @@ -package_key:required } { return [ns_cache eval xotcl_object_type_cache package_id-$package_key { - db_string get_package_id "select package_id from apm_packages where package_key = :package_key" + db_string get_package_id [::xo::db::sql select -vars package_id -from apm_packages \ + -where "package_key = :package_key" -limit 1] }] } @@ -243,7 +244,11 @@ -default } { if {![info exists package_id]} { - set package_id [expr {[info command ::xo::cc] ne "" ? [::xo::cc package_id] : [ad_conn package_id]}] + # try to get the package id; + # if everything fails, use kernel_id (to be compatible with trad. parameter::get) + set package_id [expr {[info command ::xo::cc] ne "" ? + [::xo::cc package_id] : + [ns_conn isconnected] ? [ad_conn package_id] : [ad_acs_kernel_id]}] } set parameter_obj [my get_parameter_object -parameter_name $parameter -package_id $package_id] if {$parameter_obj eq ""} { @@ -312,7 +317,7 @@ -sql [::xo::db::apm_parameter instance_select_query] \ -object_class ::xo::db::apm_parameter \ -as_ordered_composite false -named_objects true -destroy_on_cleanup false - #ns_log debug "--p got [llength [::xo::db::apm_parameter info instances]] parameters" +# ns_log notice "--p got [llength [::xo::db::apm_parameter info instances]] parameters" #foreach p [::xo::db::apm_parameter info instances] { ns_log notice [$p serialize] } parameter proc initialize_parameters {} { @@ -325,7 +330,7 @@ where p.parameter_id = v.parameter_id and coalesce(attr_value,'') <> coalesce(p.default_value,'') } { - ns_log debug "--p $parameter_id $package_key $package_id $parameter_name <$attr_value>" +# ns_log notice "--p $parameter_id $package_key $package_id $parameter_name <$attr_value>" $parameter_id set_per_package_instance_value $package_id $attr_value } } @@ -403,4 +408,4 @@ # $p save # $p delete -} +} \ No newline at end of file