Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v diff -u -r1.56 -r1.57 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 1 Mar 2005 00:01:24 -0000 1.56 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 4 Mar 2005 23:09:17 -0000 1.57 @@ -414,7 +414,7 @@ set errno [catch { set db [ns_db gethandle $pool] } error] - ad_call_proc_if_exists ds_collect_db_call $db gethandle "" $pool $start_time $errno $error + ds_collect_db_call $db gethandle "" $pool $start_time $errno $error lappend db_state(handles) $db if { $errno } { global errorInfo errorCode @@ -738,7 +738,7 @@ set errinfo $errorInfo set errcode $errorCode - ad_call_proc_if_exists ds_collect_db_call $db 0or1row $statement_name $sql $start_time $errno $error + ds_collect_db_call $db 0or1row $statement_name $sql $start_time $errno $error if { $errno == 2 } { return $error @@ -871,7 +871,7 @@ set start_time [clock clicks -milliseconds] ns_db releasehandle $db - ad_call_proc_if_exists ds_collect_db_call $db releasehandle "" "" $start_time 0 "" + ds_collect_db_call $db releasehandle "" "" $start_time 0 "" incr index_to_examine -1 } set db_state(handles) [lrange $db_state(handles) 0 $index_to_examine] @@ -887,7 +887,7 @@ } { set start_time [clock clicks -milliseconds] set errno [catch { return [ns_db getrow $db $selection] } error] - ad_call_proc_if_exists ds_collect_db_call $db getrow "" "" $start_time $errno $error + ds_collect_db_call $db getrow "" "" $start_time $errno $error if { $errno == 2 } { return $error } @@ -1005,7 +1005,7 @@ ns_log Debug "db_exec: timing [expr [clock clicks] - $start_time_fine] $db $type $statement_name" } - ad_call_proc_if_exists ds_collect_db_call $db $type $statement_name $sql $start_time $errno $error + ds_collect_db_call $db $type $statement_name $sql $start_time $errno $error if { $errno == 2 } { return $error } @@ -3026,7 +3026,7 @@ } error] - ad_call_proc_if_exists ds_collect_db_call $db $type $statement_name $sql $start_time $errno $error + ds_collect_db_call $db $type $statement_name $sql $start_time $errno $error if { $errno == 2 } { return $error } @@ -3237,7 +3237,7 @@ set errinfo $errorInfo set errcode $errorCode - ad_call_proc_if_exists ds_collect_db_call $db 0or1row $statement_name $sql $start_time $errno $error + ds_collect_db_call $db 0or1row $statement_name $sql $start_time $errno $error if { $errno == 2 } { return $error