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 -r1.27 -r1.28
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	3 Feb 2004 22:25:00 -0000	1.27
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	19 Mar 2004 12:14:16 -0000	1.28
@@ -52,14 +52,19 @@
     Returns whether we're collecting information about this request
 } {
     global ad_conn
+    if { [info exists ad_conn(ds_collection_enabled_p)] } {
+        return $ad_conn(ds_collection_enabled_p)
+    }
     if { ![info exists ad_conn(request)] } {
 	return 0
     }
     foreach pattern [nsv_get ds_properties enabled_ips] {
 	if { [string match $pattern [ad_conn peeraddr]] } {
+            set ad_conn(ds_collection_enabled_p) 1
 	    return 1
 	}
     }
+    set ad_conn(ds_collection_enabled_p) 0
     return 0
 }
 
Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	27 Feb 2004 19:39:25 -0000	1.26
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	19 Mar 2004 12:14:16 -0000	1.27
@@ -325,11 +325,25 @@
       # the declared procedure, so that data sources are set in the 
       # same frame as the code that outputs the template.
 
-      proc ::template::code::${type}::$file_stub {} "
+
+      # Here we add profiling calls in developer support exists on the 
+      # system.  
+      if {[llength [info procs ds_enabled_p]]} { 
+        proc ::template::code::${type}::$file_stub {} "
+        if {\[ds_enabled_p\] && \[ds_collection_enabled_p\]} { ds_profile start $file_stub.$type }
     	uplevel {
     	  $code
     	}
-      "
+        if {\[ds_enabled_p\] && \[ds_collection_enabled_p\]} { ds_profile stop $file_stub.$type }\n"
+      } else { 
+        proc ::template::code::${type}::$file_stub {} "
+        ds_profile start $file_stub.$type
+    	uplevel {
+    	  $code
+    	}
+        ds_profile stop $file_stub.$type\n"
+      }
+
       proc ::template::mtimes::${type}::$file_stub {} "return $mtime"
     }
   }