Index: openacs-4/packages/acs-automated-testing/www/admin/proc-coverage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/proc-coverage.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-automated-testing/www/admin/proc-coverage.tcl 7 Aug 2017 23:47:46 -0000 1.4
+++ openacs-4/packages/acs-automated-testing/www/admin/proc-coverage.tcl 9 Apr 2018 20:11:54 -0000 1.5
@@ -9,9 +9,9 @@
set all_proc_names [list]
foreach file_path [nsv_array names api_proc_doc_scripts] {
if { [regexp "^packages/$package_key" $file_path] } {
- foreach proc_name [nsv_get api_proc_doc_scripts $file_path] {
- lappend all_proc_names $proc_name
- }
+ foreach proc_name [nsv_get api_proc_doc_scripts $file_path] {
+ lappend all_proc_names $proc_name
+ }
}
}
@@ -20,17 +20,17 @@
set testcase_package_key [lindex $testcase 3]
if {$testcase_package_key eq $package_key} {
- set tested_procs [lindex $testcase 10]
- if { [llength $tested_procs] > 0 } {
- set tested_proc_names [concat $tested_proc_names $tested_procs]
- }
+ set tested_procs [lindex $testcase 10]
+ if { [llength $tested_procs] > 0 } {
+ lappend tested_proc_names {*}$tested_procs
+ }
}
}
set uncovered_procs [list]
foreach proc_name $all_proc_names {
if {$proc_name ni $tested_proc_names} {
- lappend uncovered_procs $proc_name
+ lappend uncovered_procs $proc_name
}
}
Index: openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 27 Mar 2018 12:22:17 -0000 1.13
+++ openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 9 Apr 2018 20:11:54 -0000 1.14
@@ -628,40 +628,40 @@
ad_proc -private publish::handle_item { item_id args } {
@private handle_item
-
+
Render an item either by looking it up in the the temporary cache,
or by using the appropriate mime handler. Once the item is rendered, it
is stored in the temporary cache under a key which combines the item_id,
any extra HTML parameters, and a flag which specifies whether the item
was merged with its template.
This proc takes the same arguments as the individual mime handlers.
-
+
@param item_id The id of the item to be rendered
-
+
@option revision_id {default The live revision}
The revision which is to be used when rendering the item
-
+
@option no_merge
Indicates that the item should NOT be merged with its
template. This option is used to avoid infinite recursion.
-
+
@option refresh
Re-render the item even if it exists in the cache.
Use with caution - circular dependencies may cause infinite recursion
if this option is specified
-
+
@option embed
Signifies that the content should be statically embedded directly in
the HTML. If this option is not specified, the item may
be dynamically referenced, f.ex. using the <include>
tag
-
+
@option html
Extra HTML parameters to be passed to the item handler, in format
{name value name value ...}
-
+
@return The rendered HTML for the item, or an empty string on failure
-
+
@see publish::handle_binary_file
@see publish::handle::text
@see publish::handle::image
@@ -707,28 +707,28 @@
# Render the item and cache it
ns_log debug "publish::handle_item: Rendering item $item_id"
-
+
content::item::get -item_id $item_id -array_name item_info
set item_handler [get_mime_handler $item_info(mime_type)]
-
+
if { $item_handler eq "" } {
ns_log warning "publish::handle_item: No mime handler for mime type $mime_info(mime_type)"
return ""
}
# Call the appropriate handler function
set code [list $item_handler $item_id]
- set code [concat $code $args]
+ lappend code {*}$args
- # Pass the revision_id
+ # Pass the revision_id
if { ![info exists opts(revision_id)] } {
lappend code -revision_id $revision_id
}
set html [{*}$code]
ns_log debug "publish::handle_item: Caching html for revision $revision_id"
set revision_html($revision_key) $html
-
+
return $html
}
}
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v
diff -u -N -r1.55 -r1.56
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 7 Apr 2018 19:48:03 -0000 1.55
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 9 Apr 2018 20:11:54 -0000 1.56
@@ -1038,7 +1038,7 @@
set message_count($action) [expr {$message_count($action) + $loop_message_count($action)}]
}
}
- set message_count(errors) [concat $message_count(errors) $loop_message_count(errors)]
+ lappend message_count(errors) {*}$loop_message_count(errors)
}
}
}
Index: openacs-4/packages/acs-tcl/tcl/ad-functional-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/ad-functional-procs.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-tcl/tcl/ad-functional-procs.tcl 7 Aug 2017 23:47:59 -0000 1.9
+++ openacs-4/packages/acs-tcl/tcl/ad-functional-procs.tcl 9 Apr 2018 20:11:54 -0000 1.10
@@ -506,9 +506,9 @@
ad_proc -public copy {n x} "returns list of n copies of x" {
set result {}
for {set i 0} {$i<$n} {incr i} {
- lappend result $x
+ lappend result $x
}
- return $result
+ return $result
}
# Example:
@@ -517,9 +517,9 @@
ad_proc -public cycle {n xs} "returns concatenated list of n copies of xs" {
set result {}
for {set i 0} {$i<$n} {incr i} {
- set result [concat $result $xs]
+ lappend result {*}$xs
}
- return $result
+ return $result
}
# Example:
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 -N -r1.99 -r1.100
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 27 Mar 2018 11:18:00 -0000 1.99
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 9 Apr 2018 20:11:54 -0000 1.100
@@ -700,7 +700,7 @@
set dirs [list]
lappend dirs $path
foreach subdir [glob -nocomplain -type d [file join $path *]] {
- set dirs [concat $dirs [apm_subdirs $subdir]]
+ lappend dirs {*}[apm_subdirs $subdir]
}
return $dirs
}
@@ -715,7 +715,7 @@
@author Peter Marklund
} {
array set file_type_names [apm_file_type_names]
-
+
return $file_type_names($type)
}
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.153 -r1.154
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 27 Mar 2018 12:22:17 -0000 1.153
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 9 Apr 2018 20:11:54 -0000 1.154
@@ -3580,12 +3580,12 @@
} {
Returns a list of lists with full paths and filename to all files under $path in the directory tree
- (descending the tree to a depth of up to $max_depth). Clients should not
+ (descending the tree to a depth of up to $max_depth). Clients should not
depend on the order of files returned.
DOES NOT WORK ON WINDOWS (you have to change the splitter and I don't know how to detect a windows system)
- @param include_dirs Should directories be included in the list of files.
+ @param include_dirs Should directories be included in the list of files.
@param max_depth How many levels of directories should be searched. Defaults to 1 which is the current directory
@param check_file_func Function which can be executed upon the file to determine if it is worth the effort
@param extension Only return files with this extension (single value !)
@@ -3621,7 +3621,7 @@
# If it's a file, add to our list. If it's a
# directory, add its contents to our list of files to
# examine next time.
-
+
set filename [lindex [split $file "/"] end]
set file_extension [lindex [split $filename "."] end]
if { [file isfile $file] } {
@@ -3632,7 +3632,7 @@
if { $include_dirs == 1 } {
lappend files $file
}
- set new_files_to_examine [concat $new_files_to_examine [glob -nocomplain "$file/*"]]
+ lappend new_files_to_examine {*}[glob -nocomplain "$file/*"]
}
}
}