Index: openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl 26 Mar 2007 07:44:34 -0000 1.5 +++ openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl 12 Sep 2008 20:12:08 -0000 1.6 @@ -17,13 +17,13 @@ set context [list "Last Requests"] set hide_patterns [parameter::get -parameter hide-requests -default {*.css}] -if {[string first . $request_key] > 0} { - set user_string $request_key -} else { +if {[string is integer $request_key]} { acs_user::get -user_id $request_key -array user set user_string "$user(first_names) $user(last_name)" set tmp_url [acs_community_member_url -user_id $request_key] append user_string " ($request_key)" +} else { + set user_string $request_key } append title $user_string Index: openacs-4/packages/xotcl-request-monitor/www/last100.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last100.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/xotcl-request-monitor/www/last100.tcl 21 Nov 2006 15:14:30 -0000 1.5 +++ openacs-4/packages/xotcl-request-monitor/www/last100.tcl 12 Sep 2008 20:12:08 -0000 1.6 @@ -37,11 +37,11 @@ foreach l $stat { foreach {timestamp c url ms requestor} $l break - if {[string first . $requestor] > 0} { - set user_string $requestor - } else { + if {[string is integer $requestor]} { acs_user::get -user_id $requestor -array user set user_string "$user(first_names) $user(last_name)" + } else { + set user_string $requestor } t1 add -time [clock format $timestamp -format "%H:%M:%S"] \ -user $user_string \ Index: openacs-4/packages/xotcl-request-monitor/www/last101.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last101.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xotcl-request-monitor/www/last101.tcl 14 Dec 2005 16:09:02 -0000 1.1 +++ openacs-4/packages/xotcl-request-monitor/www/last101.tcl 12 Sep 2008 20:12:08 -0000 1.2 @@ -37,11 +37,11 @@ foreach l $stat { foreach {timestamp c url ms requestor} $l break - if {[string first . $requestor] > 0} { - set user_string $requestor - } else { + if {[string is integer $requestor]} { acs_user::get -user_id $requestor -array user set user_string "$user(first_names) $user(last_name)" + } else { + set user_string $requestor } t1 add -time [clock format $timestamp -format "%H:%M:%S"] \ -user $user_string \ Index: openacs-4/packages/xotcl-request-monitor/www/running.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/running.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xotcl-request-monitor/www/running.tcl 17 Aug 2006 01:32:27 -0000 1.3 +++ openacs-4/packages/xotcl-request-monitor/www/running.tcl 12 Sep 2008 20:12:08 -0000 1.4 @@ -41,11 +41,11 @@ foreach {key elapsed} $running_requests { foreach {requestor url} [split $key ,] break set ms [format %.2f [expr {[throttle ms -start_time $elapsed]/1000.0}]] - if {[string first . $requestor] > 0} { - set user_string $requestor - } else { + if {[string is integer $requestor]} { acs_user::get -user_id $requestor -array user - set user_string "$user(first_names) $user(last_name) - $elapsed ms=$ms" + set user_string "$user(first_names) $user(last_name)" + } else { + set user_string $requestor } set user_url "last-requests?request_key=$requestor" lappend sortable_requests [list $user_string $user_url $url $ms ""] @@ -54,11 +54,11 @@ foreach {key elapsed} $entry break foreach {requestor url} [split $key ,] break set ms [format %.2f [expr {[throttle ms -start_time $elapsed]/1000.0}]] - if {[string first . $requestor] > 0} { - set user_string $requestor - } else { + if {[string is integer $requestor]} { acs_user::get -user_id $requestor -array user set user_string "$user(first_names) $user(last_name)" + } else { + set user_string $requestor } set user_url "last-requests?request_key=$requestor" lappend sortable_requests [list $user_string $user_url $url -$ms "background"] Index: openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl 14 Dec 2005 16:09:02 -0000 1.1 +++ openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl 12 Sep 2008 20:12:08 -0000 1.2 @@ -27,11 +27,11 @@ foreach {timestamp requestor} $e break if {[info exists listed($requestor)]} continue set listed($requestor) 1 - if {[string first . $requestor] > 0} { - set user_string $requestor - } else { + if {[string is integer $requestor]} { acs_user::get -user_id $requestor -array user set user_string "$user(first_names) $user(last_name)" + } else { + set user_string $requestor } set time [clock format $timestamp -format "%H:%M"] t1 add -time $time -user $user_string