Index: openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl,v diff -u -r1.6 -r1.6.4.1 --- openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl 16 Jul 2010 11:45:41 -0000 1.6 +++ openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl 22 May 2014 21:16:09 -0000 1.6.4.1 @@ -14,7 +14,7 @@ set tcl_docs_url "${tcl_docs_root}contents.htm" with_catch errmsg { - set tcl_docs_index_page [util_memoize "ns_httpget $tcl_docs_url"] + set tcl_docs_index_page [util_memoize [list ns_httpget $tcl_docs_url]] } { ad_return_error "Cannot Connect" "We're sorry, but we're having problems connecting to the server containing the Tcl documentation: $tcl_docs_url" ad_script_abort Index: openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl,v diff -u -r1.6.8.1 -r1.6.8.2 --- openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl 28 Sep 2013 12:24:24 -0000 1.6.8.1 +++ openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl 22 May 2014 21:16:09 -0000 1.6.8.2 @@ -22,7 +22,7 @@ set tcl_api_index "wiki/aolserver/Tcl_API" set tcl_api_root ${tcl_api_host}${tcl_api_index} -set tcl_api_index_page [util_memoize "ns_httpget $tcl_api_root"] +set tcl_api_index_page [util_memoize [list ns_httpget $tcl_api_root]] set tcl_proc [lindex $tcl_proc 0] for { set i [expr { [string length $tcl_proc] - 1 }] } { $i >= 0 } { incr i -1 } { Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v diff -u -r1.41.2.11 -r1.41.2.12 --- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 5 Dec 2013 11:04:13 -0000 1.41.2.11 +++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 22 May 2014 21:16:10 -0000 1.41.2.12 @@ -911,7 +911,7 @@ @param object_id the target, it is the first arg to the method @param args the remaining arguments } { - return [ad_apply ${method_name}__[util_memoize "acs_object_type $object_id"] [concat $object_id $args]] + return [ad_apply ${method_name}__[util_memoize [list acs_object_type $object_id]] [concat $object_id $args]] } ad_proc -public ad_dispatch { Index: openacs-4/packages/acs-lang/tcl/localization-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/localization-procs.tcl,v diff -u -r1.23.8.4 -r1.23.8.5 --- openacs-4/packages/acs-lang/tcl/localization-procs.tcl 2 Oct 2013 09:10:22 -0000 1.23.8.4 +++ openacs-4/packages/acs-lang/tcl/localization-procs.tcl 22 May 2014 21:16:10 -0000 1.23.8.5 @@ -334,7 +334,7 @@ # day_no becomes 0 for Sunday, through to 6 for Saturday. Perfect for addressing zero-based lists pulled from locale info. set lc_time_day_no [expr {(($lc_time_days + $y + $y/4 - $y/100 + $y/400) + (31 * $m / 12)) % 7}] - return [subst [util_memoize "lc_time_fmt_compile {$fmt} $locale"]] + return [subst [util_memoize [list lc_time_fmt_compile {$fmt} $locale]]] } ad_proc -public lc_time_fmt_compile { Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl,v diff -u -r1.32.2.2 -r1.32.2.3 --- openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl 17 Sep 2013 11:02:11 -0000 1.32.2.2 +++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl 22 May 2014 21:16:10 -0000 1.32.2.3 @@ -32,7 +32,7 @@ grant privilege Y to party X on object Z } { db_exec_plsql grant_permission {} - util_memoize_flush "permission::permission_p_not_cached -party_id $party_id -object_id $object_id -privilege $privilege" + util_memoize_flush [list permission::permission_p_not_cached -party_id $party_id -object_id $object_id -privilege $privilege] permission::permission_thread_cache_flush } Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -r1.94.2.13 -r1.94.2.14 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 5 Dec 2013 11:11:17 -0000 1.94.2.13 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 22 May 2014 21:16:10 -0000 1.94.2.14 @@ -1216,7 +1216,7 @@ ad_proc -public apm_instance_name_from_id {package_id} { @return The name of the instance. } { - return [util_memoize "apm_instance_name_from_id_mem $package_id"] + return [util_memoize [list apm_instance_name_from_id_mem $package_id]] } ad_proc -private apm_instance_name_from_id_mem {package_id} { @@ -1238,7 +1238,7 @@ } { set var ::apm::package_id_from_key($package_key) if {[info exists $var]} {return [set $var]} - set $var [util_memoize "apm_package_id_from_key_mem $package_key"] + set $var [util_memoize [list apm_package_id_from_key_mem $package_key]] #set $var [ns_cache_eval ns:memoize apm_package_id_from_key_$package_key [list apm_package_id_from_key_mem $package_key]] } @@ -1311,7 +1311,7 @@ @return The package url of the instance of the package. only valid for singleton packages. } { - return [util_memoize "apm_package_url_from_key_mem $package_key"] + return [util_memoize [list apm_package_url_from_key_mem $package_key]] } ad_proc -private apm_package_url_from_key_mem {package_key} { @@ -1342,7 +1342,7 @@ @author Peter Marklund (peter@collaboraid.biz) } { - return [util_memoize "apm_package_key_from_version_id_mem $version_id"] + return [util_memoize [list apm_package_key_from_version_id_mem $version_id]] } Index: openacs-4/packages/rss-support/tcl/rss-utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-utilities-procs.tcl,v diff -u -r1.4.20.1 -r1.4.20.2 --- openacs-4/packages/rss-support/tcl/rss-utilities-procs.tcl 27 Aug 2013 11:25:28 -0000 1.4.20.1 +++ openacs-4/packages/rss-support/tcl/rss-utilities-procs.tcl 22 May 2014 21:16:10 -0000 1.4.20.2 @@ -42,7 +42,7 @@ relative url for that node. Returns empty string if the package is not mounted. } { - return [util_memoize "rss_first_url_for_package_id_helper $package_id"] + return [util_memoize [list rss_first_url_for_package_id_helper $package_id]] } ad_proc -private rss_first_url_for_package_id_helper {