Index: openacs-4/packages/acs-templating/tcl/0-acs-templating-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/0-acs-templating-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/tcl/0-acs-templating-procs.tcl 15 Oct 2003 12:35:51 -0000 1.1 +++ openacs-4/packages/acs-templating/tcl/0-acs-templating-procs.tcl 8 Dec 2012 17:50:20 -0000 1.2 @@ -20,7 +20,7 @@ # (if the proc doesn't exist). # This makes debugging templating tags so much easier, because you don't have # to restart the server each time. - set exists_p [llength [info procs template_tag_$name]] + set exists_p [llength [info commands template_tag_$name]] switch [llength $arglist] { Index: openacs-4/packages/acs-templating/tcl/data-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/data-procs.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/acs-templating/tcl/data-procs.tcl 13 Nov 2010 23:55:58 -0000 1.16 +++ openacs-4/packages/acs-templating/tcl/data-procs.tcl 8 Dec 2012 17:50:20 -0000 1.17 @@ -434,10 +434,8 @@ @param type The data type to be transformed. } { - set proc_name [info procs ::template::data::transform::$type] - + set proc_name [info commands ::template::data::transform::$type] if { $proc_name ne {} } { - transform::$type $value_ref } } Index: openacs-4/packages/acs-templating/tcl/debug-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/Attic/debug-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-templating/tcl/debug-procs.tcl 10 Jan 2007 21:22:12 -0000 1.4 +++ openacs-4/packages/acs-templating/tcl/debug-procs.tcl 8 Dec 2012 17:50:20 -0000 1.5 @@ -10,7 +10,7 @@ set file [ns_info tcllib]/$file - set proc_name [info procs ::template::mtimes::tcl::$file] + set proc_name [info commands ::template::mtimes::tcl::$file] set mtime [file mtime $file] if { $proc_name eq {} || $mtime != [$proc_name] } { Index: openacs-4/packages/acs-templating/tcl/element-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/element-procs.tcl,v diff -u -r1.31 -r1.32 --- openacs-4/packages/acs-templating/tcl/element-procs.tcl 2 Nov 2012 12:44:15 -0000 1.31 +++ openacs-4/packages/acs-templating/tcl/element-procs.tcl 8 Dec 2012 17:50:20 -0000 1.32 @@ -597,7 +597,7 @@ set transform_proc "::template::data::transform::$datatype" - if {[info procs $transform_proc] eq {}} { + if {[info commands $transform_proc] eq {}} { set values [ns_querygetall $element(id)] 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.46 -r1.47 --- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 18 Nov 2012 18:47:20 -0000 1.46 +++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 8 Dec 2012 17:50:20 -0000 1.47 @@ -128,7 +128,7 @@ set templated_p 1 } - if { [llength [info procs ::ds_page_fragment_cache_enabled_p]] + if { [info commands ::ds_page_fragment_cache_enabled_p] ne "" && [::ds_enabled_p] && [::ds_page_fragment_cache_enabled_p] && [::ds_collection_enabled_p] } { @@ -146,7 +146,7 @@ template::code::${template_extension}::$__adp_stub # JCD: Lets keep a copy of all the page fragments! WooHoo. - if { [llength [info procs ::ds_page_fragment_cache_enabled_p]] + if { [info commands ::ds_page_fragment_cache_enabled_p] ne "" && [::ds_enabled_p] && [::ds_page_fragment_cache_enabled_p] && [::ds_collection_enabled_p] } { @@ -382,7 +382,7 @@ to the .adp or .tcl file to source. } { # this will return the name of the proc if it exists - set proc_name [info procs ::template::mtimes::${type}::$file_stub] + set proc_name [info commands ::template::mtimes::${type}::$file_stub] set pkg_id [apm_package_id_from_key acs-templating] set refresh_cache [parameter::get -package_id $pkg_id -parameter RefreshCache -default "as needed"] @@ -411,7 +411,7 @@ # Here we add profiling calls if developer support exists on the # system. - if {[llength [info procs ::ds_enabled_p]]} { + if {[info commands ::ds_enabled_p] ne ""} { proc ::template::code::${type}::$file_stub {} "if {\[::ds_enabled_p\] && \[::ds_collection_enabled_p\] && \[::ds_profiling_enabled_p\]} { ds_profile start $file_stub.$type } uplevel { $code Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v diff -u -r1.34 -r1.35 --- openacs-4/packages/acs-templating/tcl/tag-init.tcl 18 Nov 2012 18:47:20 -0000 1.34 +++ openacs-4/packages/acs-templating/tcl/tag-init.tcl 8 Dec 2012 17:50:20 -0000 1.35 @@ -73,7 +73,7 @@ template_tag slave { params } { #Start developer support frame around subordinate template. - if { [llength [info procs ::ds_enabled_p]] && [llength [info procs ::ds_adp_start_box]] } { + if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne "" } { ::ds_adp_start_box } @@ -84,7 +84,7 @@ " #End developer support frame around subordinate template. - if { [llength [info procs ::ds_enabled_p]] && [llength [info procs ::ds_adp_end_box]] } { + if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_end_box] ne "" } { ::ds_adp_end_box } @@ -97,7 +97,7 @@ set src [ns_set iget $params src] #Start developer support frame around subordinate template. - if { [llength [info procs ::ds_enabled_p]] && [llength [info procs ::ds_adp_start_box]] } { + if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne "" } { ::ds_adp_start_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]" } @@ -127,7 +127,7 @@ template::adp_append_code " } else {" template::adp_append_code " append __adp_output \"Error in include template \\\"\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]\\\": \$errmsg\"" # JCD: If we have the ds_page_bits cache maybe save the error for later - if { [llength [info procs ::ds_enabled_p]] && [llength [info procs ::ds_page_fragment_cache_enabled_p]] } { + if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_page_fragment_cache_enabled_p] ne "" } { template::adp_append_code " if {\[::ds_enabled_p\]" template::adp_append_code " && \[::ds_collection_enabled_p\] } {" template::adp_append_code " set __include_errors {}" @@ -140,7 +140,7 @@ template::adp_append_code "}" #End developer support frame around subordinate template. - if { [llength [info procs ::ds_enabled_p]] && [llength [info procs ::ds_adp_end_box]] } { + if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_end_box] ne "" } { ::ds_adp_end_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]" } @@ -637,7 +637,7 @@ set src [ns_set iget $params src] #Start developer support frame around subordinate template. - if { [llength [info procs ::ds_enabled_p]] && [llength [info procs ::ds_adp_start_box]] } { + if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne ""} { ::ds_adp_start_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]" } @@ -679,7 +679,7 @@ " #End developer support frame around subordinate template. - if { [llength [info procs ::ds_enabled_p]] && [llength [info procs ::ds_adp_end_box]] } { + if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_end_box] ne "" } { ::ds_adp_end_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]" }