Index: openacs-4/packages/ajaxhelper/www/doc/acs-integration-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/doc/acs-integration-procs.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/ajaxhelper/www/doc/acs-integration-procs.tcl 6 Oct 2013 13:21:40 -0000 1.2.2.1 +++ openacs-4/packages/ajaxhelper/www/doc/acs-integration-procs.tcl 12 Oct 2013 13:18:26 -0000 1.2.2.2 @@ -23,7 +23,7 @@ @param string If specified, will return the resulting page to the caller string instead sending it to the connection. } { - if {![empty_string_p $template]} { + if {$template ne ""} { template::set_file \ [template::util::url_to_file $template [ad_conn file]] } @@ -96,12 +96,12 @@ handle a request for an adp and/or tcl file in the template system. } { namespace eval template variable parse_level "" - #ns_log debug "adp_parse_ad_conn_file => file '[file root [ad_conn file]]'" + #ns_log debug "adp_parse_ad_conn_file => file '[file rootname [ad_conn file]]'" template::reset_request_vars - set parsed_template [template::adp_parse [file root [ad_conn file]] {}] + set parsed_template [template::adp_parse [file rootname [ad_conn file]] {}] - if {![empty_string_p $parsed_template]} { + if {$parsed_template ne ""} { # # acs-lang translator mode @@ -124,18 +124,18 @@ if { [string first "... while { [regexp -indices {\x002\(\x001([^\x001]*)\x001\)\x002} $parsed_template indices key] } { - set before [string range $parsed_template 0 [expr [lindex $indices 0] - 1]] - set after [string range $parsed_template [expr [lindex $indices 1] + 1] end] + set before [string range $parsed_template 0 [lindex $indices 0]-1] + set after [string range $parsed_template [lindex $indices 1]+1 end] set key [string range $parsed_template [lindex $key 0] [lindex $key 1]]