Index: openacs-4/packages/acs-developer-support/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/index.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-developer-support/www/index.adp 30 Dec 2003 22:46:17 -0000 1.1 @@ -0,0 +1,5 @@ + + @page_title;noquote@ + @context;noquote@ + +@body;noquote@ Index: openacs-4/packages/acs-developer-support/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/index.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-developer-support/www/index.tcl 11 Dec 2003 21:39:51 -0000 1.8 +++ openacs-4/packages/acs-developer-support/www/index.tcl 30 Dec 2003 22:46:17 -0000 1.9 @@ -18,12 +18,10 @@ set package_id [ad_conn package_id] -doc_body_append "[ad_header "ACS Developer Support"] +set page_title "Developer Support" +set context {} -

ACS Developer Support

-[ad_context_bar "Request Index"] -
- +append body "
  • Information is being swept every [ad_parameter DataSweepInterval "developer-support" 900] sec @@ -85,9 +83,9 @@ " if { [llength $requests] == 0 } { - doc_body_append "There is no request information available." + append body "There is no request information available." } else { - doc_body_append " + append body " @@ -157,7 +155,7 @@ set query "" } - doc_body_append " + append body " @@ -169,15 +167,10 @@ } } if { $show_more > 0 } { - doc_body_append "\n" + append body "\n" } - doc_body_append "
    Time
     $start   $duration 
    show $show_more more requests
    show $show_more more requests
    \n" + append body "\n" } -doc_body_append " - - -[ad_footer] -" - +append body "" Index: openacs-4/packages/acs-developer-support/www/request-info.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-developer-support/www/request-info.adp 30 Dec 2003 22:46:17 -0000 1.1 @@ -0,0 +1,5 @@ + + @page_title;noquote@ + @context;noquote@ + +@body;noquote@ Index: openacs-4/packages/acs-developer-support/www/request-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-developer-support/www/request-info.tcl 17 May 2003 09:46:09 -0000 1.4 +++ openacs-4/packages/acs-developer-support/www/request-info.tcl 30 Dec 2003 22:46:17 -0000 1.5 @@ -11,14 +11,9 @@ ds_require_permission [ad_conn package_id] "admin" -doc_body_append "[ad_admin_header "Request Information"] +set page_title "Request Information" +set context [list $page_title] -

    Request Information

    - -[ad_context_bar "Request Information"] -
    -" - foreach name [nsv_array names ds_request] { ns_log Debug "DS: Checking request $request, $name." if { [regexp {^([0-9]+)\.([a-z]+)$} $name "" m_request key] && $m_request == $request } { @@ -27,14 +22,14 @@ } if { [info exists property(start)] } { - doc_body_append " + append body "

    Parameters

    \n" + append body "\n" } } } -doc_body_append "
    Request Start Time: [clock format [lindex $property(start) 0] -format "%Y-%m-%d %H:%M:%S"]\n" } else { - doc_body_append "The information for this request is gone - either the server has been restarted, or + append body "The information for this request is gone - either the server has been restarted, or the request is more than [ad_parameter DeveloperSupportLifetime "" 900] seconds old. [ad_admin_footer]" return @@ -87,15 +82,15 @@ } } - doc_body_append "
    $name: [ad_decode $value "" "(empty)" $value]
    $name: [ad_decode $value "" "(empty)" $value]
    " +append body "" if { [info exists property(rp)] } { - doc_body_append " + append body "

    Request Processor

      " @@ -114,9 +109,9 @@ } if { [info exists conn(startclicks)] } { - doc_body_append "
    • [format "%+.1f" [expr { ($startclicks - $conn(startclicks)) / 1000.0 }]] ms: " + append body "
    • [format "%+.1f" [expr { ($startclicks - $conn(startclicks)) / 1000.0 }]] ms: " } else { - doc_body_append "
    • " + append body "
    • " } switch $kind { @@ -128,7 +123,7 @@ if { [empty_string_p $to] } { set to "?" } - doc_body_append "Applied transformation from $from -> $to - $duration\n" + append body "Applied transformation from $from -> $to - $duration\n" } filter { set kind [lindex $info 1] @@ -137,68 +132,68 @@ set proc [lindex $info 4] set args [lindex $info 5] - doc_body_append "Applied $kind filter: $proc [ns_quotehtml $args] (for $method $path) - $duration\n" + append body "Applied $kind filter: $proc [ns_quotehtml $args] (for $method $path) - $duration\n" if { [string equal $action "error"] } { - doc_body_append "
      • returned error: 
        [ns_quotehtml $error]
      \n" + append body "
      • returned error: 
        [ns_quotehtml $error]
      \n" } elseif { ![empty_string_p $action] } { - doc_body_append "
      • returned $action
      \n" + append body "
      • returned $action
      \n" } } registered_proc { set proc [lindex $info 2] set args [lindex $info 3] - doc_body_append "Called registered procedure: $proc [ns_quotehtml $args] for ($method $path) - $duration\n" + append body "Called registered procedure: $proc [ns_quotehtml $args] for ($method $path) - $duration\n" if { [string equal $action "error"] } { - doc_body_append "
      • returned error: 
        [ns_quotehtml $error]
      \n" + append body "
      • returned error: 
        [ns_quotehtml $error]
      \n" } } serve_file { set file [lindex $info 0] set handler [lindex $info 1] - doc_body_append "Served file $file with $handler - $duration\n" + append body "Served file $file with $handler - $duration\n" if { [string equal $action "error"] } { - doc_body_append "
      • returned error: 
        [ns_quotehtml $error]
      \n" + append body "
      • returned error: 
        [ns_quotehtml $error]
      \n" } } debug { - doc_body_append "$info\n" + append body "$info\n" } } } if { !$rp_show_debug_p } { - doc_body_append "

      show RP debugging information" + append body "

      show RP debugging information" } - doc_body_append "

    \n" + append body "\n" } if { [info exists property(comment)] } { - doc_body_append "

    Comments

      \n" + append body "

      Comments

        \n" foreach comment $property(comment) { - doc_body_append "
      • $comment\n" + append body "
      • $comment\n" } - doc_body_append "
      \n" + append body "
    \n" } if { [info exists property(headers)] } { - doc_body_append "

    Headers

    + append body "

    Headers

    \n" foreach { name value } $property(headers) { - doc_body_append "\n" + append body "\n" } - doc_body_append "
    $name: [ns_quotehtml $value]
    $name: [ns_quotehtml $value]
    \n" + append body "\n" } if { [info exists property(oheaders)] } { - doc_body_append "

    Output Headers

    + append body "

    Output Headers

    \n" foreach { name value } $property(oheaders) { - doc_body_append "\n" + append body "\n" } - doc_body_append "
    $name: [ns_quotehtml $value]
    $name: [ns_quotehtml $value]
    \n" + append body "\n" } if { [info exists property(db)] } { - doc_body_append "

    Database Requests

    + append body "

    Database Requests

    \n" @@ -233,16 +228,12 @@ append value "$command $handle
    [ns_quotehtml $sql]
    \n" } - doc_body_append "\n" + append body "\n" incr counter incr total [expr { $end - $start }] } - doc_body_append "\n" - doc_body_append "
      Duration    Pool  Command
      [format "%.f" [expr { ($end - $start) / 1000 }]] ms    $statement_pool  $value
      [format "%.f" [expr { ($end - $start) / 1000 }]] ms    $statement_pool  $value
      [format "%.f" [expr { $total / 1000 }]] ms  (total)
    \n" + append body "  [format "%.f" [expr { $total / 1000 }]] ms  (total)\n" + append body "\n" } - -doc_body_append " -[ad_admin_footer] -"