Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -r1.126.2.5 -r1.126.2.6 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 10 Aug 2019 14:33:26 -0000 1.126.2.5 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 9 Feb 2020 15:09:54 -0000 1.126.2.6 @@ -647,11 +647,11 @@ lappend failed($package_key) [list $req_uri $req_version] if { [info exists provided($req_uri)] } { ns_log Debug "apm_dependency_check_new: Failed dependency:\ - $package_key embeds/extends/requires $req_uri $req_version,\ - but we only provide $provided($req_uri)" + $package_key embeds/extends/requires $req_uri $req_version,\ + but we only provide $provided($req_uri)" } else { ns_log Debug "apm_dependency_check_new: Failed dependency:\ - $package_key embeds/extends/requires $req_uri $req_version, but we don't have it" + $package_key embeds/extends/requires $req_uri $req_version, but we don't have it" } } } @@ -704,7 +704,7 @@ } if { ![apm_package_supports_rdbms_p -package_key $package(package.key)] - || [apm_package_installed_p $package(package.key)] + || [apm_package_installed_p $package(package.key)] } { ns_log notice "apm_simple_package_install: no need to install $package(package.key)" return @@ -1033,7 +1033,7 @@ ad_proc apm_unregister_disinherited_params { package_key dependency_id } { Remove parameters for package_key that have been disinherited (i.e., the - dependency that caused them to be inherited have been removed). Called only + dependency that caused them to be inherited have been removed). Called only by the APM and keep it that way, please. } { @@ -1918,25 +1918,25 @@ {-to_version_name:required} } { apm_upgrade_logic \ - -from_version_name $from_version_name \ - -to_version_name $to_version_name \ - -spec { - 1.1 1.2 { - ... + -from_version_name $from_version_name \ + -to_version_name $to_version_name \ + -spec { + 1.1 1.2 { + ... + } + 1.2 1.3 { + ... + } + 1.4d 1.4d1 { + ... + } + 2.1 2.3 { + ... + } + 2.3 2.4 { + ... + } } - 1.2 1.3 { - ... - } - 1.4d 1.4d1 { - ... - } - 2.1 2.3 { - ... - } - 2.3 2.4 { - ... - } - } } Index: openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl,v diff -u -r1.21 -r1.21.2.1 --- openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl 9 May 2018 15:33:29 -0000 1.21 +++ openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl 9 Feb 2020 15:09:54 -0000 1.21.2.1 @@ -26,49 +26,49 @@ # lock contention. Thanks to davis@xarg.net. if { [parameter::get -package_id $::acs::kernel_id -parameter PerformanceModeP -default 0] } { - ad_proc -private rp_performance_mode {} { - Returns 1 if the request processor is in performance mode, 0 otherwise. - } { - return 1 - } + ad_proc -private rp_performance_mode {} { + Returns 1 if the request processor is in performance mode, 0 otherwise. + } { + return 1 + } } else { - ad_proc -private rp_performance_mode {} { - Returns 1 if the request processor is in performance mode, 0 otherwise. - } { - return 0 - } + ad_proc -private rp_performance_mode {} { + Returns 1 if the request processor is in performance mode, 0 otherwise. + } { + return 0 + } } if { [parameter::get -package_id $::acs::kernel_id -parameter DebugP -default 0] || [parameter::get -package_id $::acs::kernel_id -parameter LogDebugP -default 0] - } { + } { ad_proc -private rp_debug { { -debug f } { -ns_log_level notice } string } { - Logs a debugging message, including a high-resolution (millisecond) - timestamp. - + Logs a debugging message, including a high-resolution (millisecond) + timestamp. + } { - if { [parameter::get -package_id $::acs::kernel_id -parameter DebugP -default 0] } { - set clicks [clock clicks -milliseconds] - ds_add rp [list debug $string $clicks $clicks] - } - if { [parameter::get -package_id $::acs::kernel_id -parameter LogDebugP -default 0] - || [string is true -strict $debug] - } { - if { [info exists ::ad_conn(start_clicks)] } { - set timing " ([expr {[clock clicks -milliseconds] - $::ad_conn(start_clicks)}] ms)" - } else { - set timing "" - } - ns_log $ns_log_level "RP$timing: $string" - } + if { [parameter::get -package_id $::acs::kernel_id -parameter DebugP -default 0] } { + set clicks [clock clicks -milliseconds] + ds_add rp [list debug $string $clicks $clicks] + } + if { [parameter::get -package_id $::acs::kernel_id -parameter LogDebugP -default 0] + || [string is true -strict $debug] + } { + if { [info exists ::ad_conn(start_clicks)] } { + set timing " ([expr {[clock clicks -milliseconds] - $::ad_conn(start_clicks)}] ms)" + } else { + set timing "" + } + ns_log $ns_log_level "RP$timing: $string" + } } } else { ad_proc -private rp_debug { { -debug f } { -ns_log_level notice } string } { - dummy placeholder + dummy placeholder } { - return + return } } @@ -98,9 +98,9 @@ set listings [ns_config "ns/server/[ns_info server]" "directorylisting" "none"] if { $listings eq "fancy" || $listings eq "simple" } { - nsv_set rp_directory_listing_p . 1 + nsv_set rp_directory_listing_p . 1 } else { - nsv_set rp_directory_listing_p . 0 + nsv_set rp_directory_listing_p . 0 } # this initialization must be in a package alphabetically before @@ -127,31 +127,31 @@ set filter_index 0 foreach filter_info $filters { - lassign $filter_info priority kind method path \ - proc arg debug critical description script + lassign $filter_info priority kind method path \ + proc arg debug critical description script - # Figure out how to invoke the filter, based on the number of arguments. - if { [llength [info procs $proc]] == 0 } { - # [info procs $proc] returns nothing when the procedure has been - # registered by C code (e.g., ns_returnredirect). Assume that neither - # "conn" nor "why" is present in this case. - set arg_count 1 - } else { - set arg_count [llength [info args $proc]] - } + # Figure out how to invoke the filter, based on the number of arguments. + if { [llength [info procs $proc]] == 0 } { + # [info procs $proc] returns nothing when the procedure has been + # registered by C code (e.g., ns_returnredirect). Assume that neither + # "conn" nor "why" is present in this case. + set arg_count 1 + } else { + set arg_count [llength [info args $proc]] + } - if { $debug == "t" } { - set debug_p 1 - } else { - set debug_p 0 - } + if { $debug == "t" } { + set debug_p 1 + } else { + set debug_p 0 + } ns_log Notice "ns_register_filter $kind $method $path rp_invoke_filter \ - [list $filter_index $debug_p $arg_count $proc $arg]" + [list $filter_index $debug_p $arg_count $proc $arg]" ns_register_filter $kind $method $path rp_invoke_filter \ - [list $filter_index $debug_p $arg_count $proc $arg] + [list $filter_index $debug_p $arg_count $proc $arg] - incr filter_index + incr filter_index } } @@ -164,33 +164,33 @@ set proc_index 0 foreach proc_info $procs { - lassign $proc_info method path proc arg debug noinherit description script + lassign $proc_info method path proc arg debug noinherit description script - if { $noinherit == "t" } { - set noinherit_switch "-noinherit" - } else { - set noinherit_switch "" - } + if { $noinherit == "t" } { + set noinherit_switch "-noinherit" + } else { + set noinherit_switch "" + } - # Figure out how to invoke the filter, based on the number of arguments. - if { [llength [info procs $proc]] == 0 } { - # [info procs $proc] returns nothing when the procedure has been - # registered by C code (e.g., ns_returnredirect). Assume that neither - # "conn" nor "why" is present in this case. - set arg_count 1 - } else { - set arg_count [llength [info args $proc]] - } + # Figure out how to invoke the filter, based on the number of arguments. + if { [llength [info procs $proc]] == 0 } { + # [info procs $proc] returns nothing when the procedure has been + # registered by C code (e.g., ns_returnredirect). Assume that neither + # "conn" nor "why" is present in this case. + set arg_count 1 + } else { + set arg_count [llength [info args $proc]] + } - if { $debug == "t" } { - set debug_p 1 - } else { - set debug_p 0 - } + if { $debug == "t" } { + set debug_p 1 + } else { + set debug_p 0 + } - ns_log Notice "ns_register_proc $noinherit_switch [list $method $path rp_invoke_proc [list $proc_index $debug_p $arg_count $proc $arg]]" - ns_register_proc {*}$noinherit_switch \ - $method $path rp_invoke_proc [list $proc_index $debug_p $arg_count $proc $arg] + ns_log Notice "ns_register_proc $noinherit_switch [list $method $path rp_invoke_proc [list $proc_index $debug_p $arg_count $proc $arg]]" + ns_register_proc {*}$noinherit_switch \ + $method $path rp_invoke_proc [list $proc_index $debug_p $arg_count $proc $arg] } } Index: openacs-4/packages/forums/www/forum-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v diff -u -r1.38.2.1 -r1.38.2.2 --- openacs-4/packages/forums/www/forum-view.tcl 9 Feb 2020 08:11:53 -0000 1.38.2.1 +++ openacs-4/packages/forums/www/forum-view.tcl 9 Feb 2020 15:09:54 -0000 1.38.2.2 @@ -19,11 +19,11 @@ # Get forum data # forum::get -forum_id $forum_id -array forum - + } trap NOT_FOUND {} { ns_returnnotfound ad_script_abort - + } on error {errMsg} { error $errMsg $::errorInfo $::errorCode } @@ -53,8 +53,8 @@ set type_id [notification::type::get_type_id -short_name forums_forum_notif] set notification_count [notification::request::request_count \ - -type_id $type_id \ - -object_id $forum_id] + -type_id $type_id \ + -object_id $forum_id] # Local variables: # mode: tcl