Index: openacs-4/packages/acs-templating/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/filter-procs.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-templating/tcl/filter-procs.tcl 7 Aug 2017 23:48:01 -0000 1.17
+++ openacs-4/packages/acs-templating/tcl/filter-procs.tcl 17 Jan 2018 21:57:34 -0000 1.18
@@ -76,7 +76,7 @@
ad_proc -public cmp_page_filter { why } {
Show the compiled template (for debugging)
} {
- if { [catch {
+ ad_try {
set url [ns_conn url]
regsub {.cmp} $url {} url_stub
regexp {^/([^/]*)(.*)} $url_stub all package_key rest
@@ -87,8 +87,8 @@
set timeElapsed [expr ([clock clicks -milliseconds] - $beginTime)]
ns_log debug "cmp_page_filter: Time elapsed: $timeElapsed"
-
- } errMsg] } {
+
+ } on error {errorMsg} {
set output [ns_quotehtml $::errorInfo]
}
@@ -100,7 +100,7 @@
ad_proc -public dat_page_filter { why } {
Show the comments for the template (for designer)
} {
- if { [catch {
+ ad_try {
set url [ns_conn url]
regsub {.dat} $url {} url_stub
regexp {^/([^/]*)(.*)} $url_stub all package_key rest
@@ -114,8 +114,8 @@
set timeElapsed [expr ([clock clicks -milliseconds] - $beginTime)]
ns_log debug " dat_page_filter: Time elapsed: $timeElapsed"
- } errMsg] } {
- set output $::errorInfo
+ } on error {errorMsg} {
+ set output [ns_quotehtml $::errorInfo]
}
ns_return 200 text/html $output
@@ -152,15 +152,15 @@
ad_proc -private frm_page_filter { why } {
Return the form data for a request for .frm
} {
- if { [catch {
+ ad_try {
set beginTime [clock clicks -milliseconds]
set output [template::frm_page_handler]
set timeElapsed [expr ([clock clicks -milliseconds] - $beginTime)]
ns_log debug "frm_page_filter: Time elapsed: $timeElapsed"
- } errMsg] } {
+ } on error {errorMsg} {
set output $::errorInfo
}