Index: openacs-4/packages/acs-admin/www/cache/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/cache/one.tcl,v diff -u -N -r1.3 -r1.3.10.1 --- openacs-4/packages/acs-admin/www/cache/one.tcl 10 Jan 2007 21:22:00 -0000 1.3 +++ openacs-4/packages/acs-admin/www/cache/one.tcl 8 Apr 2014 20:20:35 -0000 1.3.10.1 @@ -9,31 +9,46 @@ set page_title "One Entry" set context [list [list "../developer" "Developer's Administration"] [list "." "Cache Control"] $page_title] -if {[catch {set pair [ns_cache get util_memoize $key]} errmsg]} { - # backup plan, find it again because the key doesn't always - # pass through cleanly - set cached_names [ns_cache names util_memoize] - foreach name $cached_names { - if {[regexp -nocase -- $pattern $name match]} { - set pair [ns_cache get util_memoize $name] - set raw_time [lindex $pair 0] - if {$raw_time == $raw_date} { - set value [ad_quotehtml [lindex $pair 1]] - set time [clock format $raw_time] - set key $name - break - } - } +if {[ns_info name] eq "NaviServer"} { + + if {$raw_date eq 0} { + set time "No expiration" + } else { + set date [clock format $raw_date -format "%d %b %H:%M:%S"] + set time "Expires $date" } - if {![info exists value] || "" eq $value} { + + if {[catch {set value [ns_cache get util_memoize $key]} errmsg]} { set value "could not retrieve" - set time "?" } + set value [ad_quotehtml $value] + } else { - set value [ad_quotehtml [lindex $pair 1]] - set time [clock format [lindex $pair 0]] + if {[catch {set pair [ns_cache get util_memoize $key]} errmsg]} { + # backup plan, find it again because the key doesn't always + # pass through cleanly + set cached_names [ns_cache names util_memoize] + foreach name $cached_names { + if {[regexp -nocase -- $pattern $name match]} { + set pair [ns_cache get util_memoize $name] + set raw_time [lindex $pair 0] + if {$raw_time == $raw_date} { + set value [ad_quotehtml [lindex $pair 1]] + set time [clock format $raw_time] + set key $name + break + } + } + } + if {![info exists value] || "" eq $value} { + set value "could not retrieve" + set time "?" + } + } else { + set value [ad_quotehtml [lindex $pair 1]] + set time [clock format [lindex $pair 0]] + } } - set safe_key [ad_quotehtml $key] regsub -all -nocase -- $pattern $key \