Index: openacs-4/packages/acs-developer-support/lib/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.adp,v
diff -u -N -r1.20 -r1.20.2.1
--- openacs-4/packages/acs-developer-support/lib/toolbar.adp	9 Jun 2015 06:23:36 -0000	1.20
+++ openacs-4/packages/acs-developer-support/lib/toolbar.adp	16 Sep 2015 09:18:55 -0000	1.20.2.1
@@ -19,23 +19,23 @@
           <span>|</span></li>
           <li><a href="@oacs_shell_url@" title="Execute commands and see the result">Shell</a>
           <span>|</span></li>
-          <li><a href="@base_url@/acs-admin/apm/" title="Modify/reload packages">APM</a>
+          <li><a href="/acs-admin/apm/" title="Modify/reload packages">APM</a>
           <span>|</span></li>
-          <li><a href="@base_url@/admin/site-map/" title="Manage your package instances">Site&nbsp;Map</a>
+          <li><a href="/admin/site-map/" title="Manage your package instances">Site&nbsp;Map</a>
           <span>|</span></li>
-          <li><a href="@base_url@/acs-admin/apm/?reload_links_p=1" title="Scan for changed library files">Changed</a>
+          <li><a href="/acs-admin/apm/?reload_links_p=1" title="Scan for changed library files">Changed</a>
           <span>|</span></li>
           <li><a href="@flush_url@" title="Flush entire util_memoize cache">Flush</a>
           <span>|</span></li>
           <li><a href="@auto_test_url@" title="Automated Testing Home">Test</a>
           <span>|</span></li>
-          <li><a href="@base_url@/acs-admin/users/" title="Add/edit/become users">Users</a>
+          <li><a href="/acs-admin/users/" title="Add/edit/become users">Users</a>
           <span>|</span></li>
-          <li><a href="@base_url@/acs-lang/admin/" title="Add/edit message keys">I18n</a>
+          <li><a href="/acs-lang/admin/" title="Add/edit message keys">I18n</a>
           <span>|</span></li>
-          <li><a href="@base_url@/doc/" title="View system documentation">Docs</a>
+          <li><a href="/doc/" title="View system documentation">Docs</a>
           <span>|</span></li>
-          <li><a href="@base_url@/api-doc/" title="View/search OpenACS Tcl API documentation">API&nbsp;doc</a>
+          <li><a href="/api-doc/" title="View/search OpenACS Tcl API documentation">API&nbsp;doc</a>
           <if @rm_url@ ne ""><span>|</span></li>
 	  <li><a href="@rm_url@" title="View requests in the request monitor">Requests</a></li>
 	  </if><else>
@@ -45,7 +45,7 @@
       </td>
 
       <td align="right" id="developer-search">
-        <form action="@base_url@/api-doc/proc-search">
+        <form action="/api-doc/proc-search">
 	  <div><input type="hidden" name="search_type" value="All+matches">
           <input type="hidden" name="name_weight" value="5">
           <input type="hidden" name="param_weight" value="3">
Index: openacs-4/packages/acs-developer-support/lib/toolbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.tcl,v
diff -u -N -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/acs-developer-support/lib/toolbar.tcl	10 Sep 2015 08:21:23 -0000	1.14.2.1
+++ openacs-4/packages/acs-developer-support/lib/toolbar.tcl	16 Sep 2015 09:18:55 -0000	1.14.2.2
@@ -6,9 +6,8 @@
 set show_p [ds_show_p]
 
 if { $show_p } {
-    set ds_url [ds_support_url]
 
-    set base_url [ad_url]
+    set ds_url [ds_support_url]
     set num_comments [llength [ds_get_comments]]
 
     multirow create ds_buttons label title toggle_url state
@@ -40,7 +39,7 @@
 
     multirow append ds_buttons TRN \
         "Toggle translation mode" \
-        [export_vars -base "[ad_url]/acs-lang/admin/translator-mode-toggle" { { return_url [ad_return_url]}}] \
+        [export_vars -base "/acs-lang/admin/translator-mode-toggle" { { return_url [ad_return_url]}}] \
         [ad_decode [lang::util::translator_mode_p] 1 "on" "off"]
 
     multirow append ds_buttons ADP \
@@ -53,25 +52,20 @@
         {javascript:void(d=document);void(el=d.getElementsByTagName('div'));for(i=0;i<el.length;i++){if(el[i].className=='developer-support-footer'){void(el[i].className='developer-support-footer-off')}else{if(el[i].className=='developer-support-footer-off'){void(el[i].className='developer-support-footer')}}};} \
         off
 
-
     set oacs_shell_url "${ds_url}shell"
-
     set auto_test_url [site_node::get_package_url -package_key acs-automated-testing]
-
     set request_info_url [export_vars -base "${ds_url}request-info" { { request {[ad_conn request]} } }]
-
     set page_ms [lc_numeric [ds_get_page_serve_time_ms]]
-
-    set db_info [ds_get_db_command_info]
-
-    set db_num_cmds [lindex $db_info 0]
-    if {[lindex $db_info 1] eq ""} {
-	set db_num_ms [lc_numeric [lindex $db_info 1]]
-    } else {
-	set db_num_ms [lc_numeric [format %.1f [lindex $db_info 1]]]
+    
+    lassign [ds_get_db_command_info] db_num_cmds db_num_ms
+    if {$db_num_ms ne ""} {
+        set db_num_ms [lc_numeric [format %.1f $db_num_ms]]
     }
 
-    set flush_url [export_vars -base "[ad_url]/acs-admin/cache/flush-cache" { { suffix util_memoize } { return_url [ad_return_url] } }]
+    set flush_url [export_vars -base "/acs-admin/cache/flush-cache" {
+        { suffix util_memoize }
+        { return_url [ad_return_url]}
+    }]
 
     if { $page_ms eq "" } {
         set request_info_label "Request info"
@@ -96,20 +90,20 @@
             if {$type eq "text/css"} {
                 lappend css_list $href
             }
-	}
+        }
     }
 }
 
 if {$css_list ne ""} {
     multirow append ds_buttons CSS \
         "Show CSS" \
         [export_vars -base "/ds/css-list" { css_list { return_url [ad_return_url] } }] \
-	off
+        off
 }
 
 set rm_package_id [apm_package_id_from_key xotcl-request-monitor]
 if {$rm_package_id > 0} {
-    set rm_url "${base_url}[apm_package_url_from_id $rm_package_id]"
+    set rm_url [apm_package_url_from_id $rm_package_id]
 } else {
     set rm_url ""
 }
Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v
diff -u -N -r1.55.2.2 -r1.55.2.3
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	15 Sep 2015 17:52:16 -0000	1.55.2.2
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	16 Sep 2015 09:18:55 -0000	1.55.2.3
@@ -278,7 +278,7 @@
  ad_proc -public ds_get_db_command_info {} {
      Get a Tcl list with { num_commands total_ms } for the database commands for the request.
 
-     Returns the empty string if the information is not available.
+     @return list containing num_commands and total_ms, or empty string if the information is not available.
  } { 
      set result {}
      if { [ds_enabled_p] && [ds_collection_enabled_p] } {