An internal error ocurred while preparing a template $url_stub:
-$errorInfo- " - } - - if { [string length $output] } { - ns_return 200 text/html $output - } - - return filter_return -} - # Redirect and abort processing ad_proc -public template::forward { url } { - if { ! [string match http://* $url] } { - - if { [string index $url 0] != "/" } { - set url [util::get_url_directory [ns_conn url]]$url - } - set host_name [ns_set iget [ns_conn headers] Host] - set url http://$host_name$url - } + # DRB: The code that was here before didn't preserve the protocol, always + # using HTTP even if HTTPS was used to establish the connection. Besides + # which ad_returnredirect has funky checks for even funkier browsers, and + # is therefore not only the standard way to redirect in OpenACS 4 but + # more robust as well. - global errorInfo - - ns_returnredirect $url - - # (DanW OpenACS, dcwickstrom@earthlink.net) - commented this out since the - # rp doesn't seem to support this processing method. It appears that this - # is used as a mechanism to abort further processing of a page, but the rp - # doesn't have the catch and continue code as implied by acs_page_filter - # example shown above. - #error FILTER_ABORT + ad_returnredirect $url + ad_script_abort } # Run any filter procedures that have been registered with the @@ -113,14 +48,22 @@ } } +# DRB: The following debugging filters weren't integrated with OpenACS. +# I fixed them but not very elegantly - they assume you're trying to debug +# a template within a package, not at the top www level. As it turns out +# the query processor makes similar assumptions so making these work for +# "/foo"-style URLs would require fixing it, too. Also ACS 4.2 had these +# debugging filters enabled by default. I've turned them off by default. + # Show the compiled template (for debugging) ad_proc -public cmp_page_filter { why } { if { [catch { - set url [ad_conn url] - regsub {.cmp$} $url {} url_stub - set file_stub [ns_url2file $url_stub] + set url [ns_conn url] + regsub {.cmp} $url {} url_stub + regexp {^/([^/]*)(.*)} $url_stub all package_key rest + set file_stub "[acs_root_dir]/packages/$package_key/www$rest" set beginTime [clock clicks] @@ -145,9 +88,10 @@ ad_proc -public dat_page_filter { why } { if { [catch { - set url [ad_conn url] - regsub {.dat$} $url {} url_stub - set code_stub [ns_url2file $url_stub] + set url [ns_conn url] + regsub {.dat} $url {} url_stub + regexp {^/([^/]*)(.*)} $url_stub all package_key rest + set code_stub "[acs_root_dir]/packages/$package_key/www$rest" set beginTime [clock clicks] @@ -170,17 +114,19 @@ # Return the auto-generated template for a form -ad_proc -public frm_page_filter { why } { - namespace eval template { +namespace eval template { - if { [catch { + ad_proc -private frm_page_handler { } { + Build the form information for the form page filter. This was + originally handled inline but doing so screwed up the query + processor. + } { set url [ns_conn url] regsub {.frm} $url {} url_stub - set __adp_stub [ns_url2file $url_stub] + regexp {^/([^/]*)(.*)} $url_stub all package_key rest + set __adp_stub "[acs_root_dir]/packages/$package_key/www$rest" - set beginTime [clock clicks] - # Set the parse level variable parse_level lappend parse_level [info level] @@ -189,9 +135,17 @@ adp_prepare # get the form template - set output [form::template \ - [ns_queryget form_id] [ns_queryget form_style]] + return [form::template [ns_queryget form_id] [ns_queryget form_style]] + } +} +ad_proc -public frm_page_filter { why } { + if { [catch { + + set beginTime [clock clicks] + + set output [template::frm_page_handler] + set timeElapsed [expr ([clock clicks] - $beginTime) / 1000.] ns_log Notice "Time elapsed: $timeElapsed" @@ -204,7 +158,6 @@
[ns_quotehtml $output]