Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/00-database-procs.tcl,v
diff -u -r1.86.2.8 -r1.86.2.9
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 2 Oct 2013 22:55:54 -0000 1.86.2.8
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 12 Oct 2013 13:55:17 -0000 1.86.2.9
@@ -836,8 +836,7 @@
set all_indices [regexp -inline -indices -all -- {(?:^|[^'])(')(?:[^']|'')+(')(?=$|[^'])} $sql]
for {set i 0} { $i < [llength $all_indices] } { incr i 3 } {
- lappend quote_indices [lindex [lindex $all_indices $i+1] 0]
- lappend quote_indices [lindex [lindex $all_indices $i+2] 0]
+ lappend quote_indices [lindex $all_indices $i+1 0] [lindex $all_indices $i+2 0]
}
return $quote_indices
@@ -869,8 +868,8 @@
uplevel {
set __db_lst [regexp -inline -indices -all -- {:?:\w+} $__db_sql]
for {set __db_i [expr {[llength $__db_lst] - 1}]} {$__db_i >= 0} {incr __db_i -1} {
- set __db_ws [lindex [lindex $__db_lst $__db_i] 0]
- set __db_we [lindex [lindex $__db_lst $__db_i] 1]
+ set __db_ws [lindex $__db_lst $__db_i 0]
+ set __db_we [lindex $__db_lst $__db_i 1]
set __db_bind_var [string range $__db_sql $__db_ws $__db_we]
if {![string match "::*" $__db_bind_var] && ![db_bind_var_quoted_p $__db_sql $__db_ws $__db_we]} {
set __db_tcl_var [string range $__db_bind_var 1 end]
@@ -891,8 +890,8 @@
set lsql $sql
set lst [regexp -inline -indices -all -- {:?:\w+} $sql]
for {set i [expr {[llength $lst] - 1}]} {$i >= 0} {incr i -1} {
- set ws [lindex [lindex $lst $i] 0]
- set we [lindex [lindex $lst $i] 1]
+ set ws [lindex $lst $i 0]
+ set we [lindex $lst $i 1]
set bind_var [string range $sql $ws $we]
if {![string match "::*" $bind_var] && ![db_bind_var_quoted_p $lsql $ws $we]} {
set tcl_var [string range $bind_var 1 end]
@@ -1438,7 +1437,7 @@
set columns $local_columns
} else {
# Check that the columns match, if not throw an error
- if { ![string equal [join [lsort -ascii $local_columns]] [join [lsort -ascii $columns]]] } {
+ if { [join [lsort -ascii $local_columns]] ne [join [lsort -ascii $columns]] } {
error "Appending to a multirow with differing columns.
Original columns : [join [lsort -ascii $columns] ", "].
Columns in this query: [join [lsort -ascii $local_columns] ", "]" "" "ACS_MULTIROW_APPEND_COLUMNS_MISMATCH"
@@ -1752,12 +1751,9 @@
return [list $counter $columns $values]
}]
- set counter [lindex $value 0]
- set columns [lindex $value 1]
- set values [lindex $value 2]
+ lassign $value counter columns values
set count 1
-
foreach value $values {
upvar $level_up "$var_name:[expr {$count}]" array_val
array set array_val $value
@@ -2666,7 +2662,7 @@
set pgpass "<<$pgpass"
}
- if { [string equal [db_get_dbhost] "localhost"] || [string equal [db_get_dbhost] ""] } {
+ if { [db_get_dbhost] eq "localhost" || [db_get_dbhost] eq "" } {
set pghost ""
} else {
set pghost "-h [db_get_dbhost]"
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.8 -r1.94.2.9
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 6 Oct 2013 12:36:51 -0000 1.94.2.8
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 12 Oct 2013 13:55:17 -0000 1.94.2.9
@@ -1999,7 +1999,7 @@
set pg_files {}
foreach file $filelist {
if { [string match {*/postgresql/*} $file]
- && ![string match *-drop.sql $file]
+ && ![string match "*-drop.sql" $file]
&& ![string match {*/upgrade/*} $file]
} {
lappend pg_files $file
@@ -2012,7 +2012,7 @@
set ora_files {}
foreach file $filelist {
if { [string match {*/oracle/*} $file]
- && ![string match *-drop.sql $file]
+ && ![string match "*-drop.sql" $file]
&& ![string match {*/upgrade/*} $file]
} {
lappend ora_files $file
Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v
diff -u -r1.30.4.1 -r1.30.4.2
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 2 Oct 2013 07:44:14 -0000 1.30.4.1
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 12 Oct 2013 13:55:18 -0000 1.30.4.2
@@ -325,7 +325,7 @@
set service_uri [apm_required_attribute_value $node url]
set service_version [apm_required_attribute_value $node version]
# Package always provides itself, we'll add that below, so don't add it here
- if { $dependency_type ne "provides" || ![string equal $service_uri $properties(package.key)] } {
+ if { $dependency_type ne "provides" || $service_uri ne $properties(package.key) } {
lappend properties($dependency_type) [list $service_uri $service_version]
}
}
Index: openacs-4/packages/acs-tcl/tcl/callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/callback-procs.tcl,v
diff -u -r1.1 -r1.1.16.1
--- openacs-4/packages/acs-tcl/tcl/callback-procs.tcl 11 Apr 2005 22:21:21 -0000 1.1
+++ openacs-4/packages/acs-tcl/tcl/callback-procs.tcl 12 Oct 2013 13:55:18 -0000 1.1.16.1
@@ -12,9 +12,7 @@
} {
Returns whether the specified implementation exists.
} {
- return [expr {![string equal \
- [info commands ::callback::${callback}::impl::${impl}] \
- ""]}]
+ return [expr {[info commands ::callback::${callback}::impl::${impl}] ne ""}]
}
ad_proc -public callback::get_object_type_impl {
Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -r1.30.2.2 -r1.30.2.3
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 29 Sep 2013 19:23:18 -0000 1.30.2.2
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 12 Oct 2013 13:55:18 -0000 1.30.2.3
@@ -181,7 +181,7 @@
if {[llength $args] == 0} {
# fix last element to just be literal string
- set context [lreplace $context end end [lindex [lindex $context end] 1]]
+ set context [lreplace $context end end [lindex $context end 1]]
} else {
if {![string match "\{*" $args]} {
# args is not a list, transform it into one.
@@ -387,7 +387,7 @@
# the current url then select it
if {$highlight_url ne "" && $highlight_url == [lindex $urls $counter]} {
append return_string "<OPTION VALUE=\"[lindex $urls $counter]\" selected>$item"
- } elseif {$highlight_url eq "" && [string match *$url_stub* [lindex $urls $counter]]} {
+ } elseif {$highlight_url eq "" && [string match "*$url_stub*" [lindex $urls $counter]]} {
append return_string "<OPTION VALUE=\"[lindex $urls $counter]\" selected>$item"
} else {
append return_string "<OPTION VALUE=\"[lindex $urls $counter]\">$item"
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.113.2.14 -r1.113.2.15
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 7 Oct 2013 16:55:59 -0000 1.113.2.14
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 12 Oct 2013 13:55:18 -0000 1.113.2.15
@@ -850,7 +850,7 @@
ad_returnredirect [ns_conn url]
return
}
- if {$ad_conn(extra_url) ne "" && ![string match *$ad_conn(extra_url) [ns_conn url]]} {
+ if {$ad_conn(extra_url) ne "" && ![string match "*$ad_conn(extra_url)" [ns_conn url]]} {
#
# On internal redirects, the current ad_conn(extra_url) might be
# from a previous request, which might have lead to a not-found
@@ -933,7 +933,7 @@
}
if {[info exists dir_index]
- && ![string match */CVS/* $dir_index]
+ && ![string match "*/CVS/*" $dir_index]
} {
if { [nsv_get rp_directory_listing_p .] } {
ns_returnnotice 200 "Directory listing of $dir_index" \
Index: openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/table-display-procs.tcl,v
diff -u -r1.20.8.8 -r1.20.8.9
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl 10 Oct 2013 20:44:08 -0000 1.20.8.8
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl 12 Oct 2013 13:55:18 -0000 1.20.8.9
@@ -517,8 +517,8 @@
if {$columns eq ""} {
for {set i 0} {$i < [llength $datadef]} {incr i} {
if {$sortable eq "all"
- || ($sortable == "t" && [lindex [lindex $datadef $i] 2] != "no_sort")
- || ($sortable == "f" && [lindex [lindex $datadef $i] 2] == "no_sort")
+ || ($sortable == "t" && [lindex $datadef $i 2] ne "no_sort")
+ || ($sortable == "f" && [lindex $datadef $i 2] eq "no_sort")
} {
lappend column_list $i
}
@@ -642,12 +642,12 @@
# select table
set options "<option value=\"\">---</option>"
foreach opt $sel_list {
- append options " <option value=\"[lindex [lindex $datadef $opt] 0]\">[lindex [lindex $datadef $opt] 1]</option>"
+ append options " <option value=\"[lindex $datadef $opt 0]\">[lindex $datadef $opt 1]</option>"
}
for {set i 0} { $i < $max_columns} {incr i} {
if {$i < $n_sel_columns} {
- set match [lindex [lindex $datadef [lindex $sel_columns $i]] 0]
+ set match [lindex $datadef [lindex $sel_columns $i] 0]
regsub "(<option )(value=\"$match\">)" $options "\\1 selected=\"selected\" \\2" out
} else {
set out $options
@@ -658,16 +658,16 @@
# radio button table
append html "<tr><th>Col \#</th>"
foreach opt $sel_list {
- append html "<th>[lindex [lindex $datadef $opt] 1]</th>"
+ append html "<th>[lindex $datadef $opt 1]</th>"
}
append html "</tr>"
foreach opt $sel_list {
- append options "<td><input name=\"col_@@\" type=\"radio\" value=\"[lindex [lindex $datadef $opt] 0]\"></td>"
+ append options "<td><input name=\"col_@@\" type=\"radio\" value=\"[lindex $datadef $opt 0]\"></td>"
}
for {set i 0} { $i < $max_columns} {incr i} {
if {$i < $n_sel_columns} {
- set match [lindex [lindex $datadef [lindex $sel_columns $i]] 0]
+ set match [lindex $datadef [lindex $sel_columns $i] 0]
regsub "( type=\"radio\" )(value=\"$match\">)" $options "\\1 checked=\"checked\" \\2" out
} else {
set out $options
@@ -765,7 +765,7 @@
set options "<option value=\"\">---</option>"
foreach opt $sel_list {
- append options " <option value=\"[lindex [lindex $datadef $opt] 0]\">[lindex [lindex $datadef $opt] 1]</option>"
+ append options " <option value=\"[lindex $datadef $opt 0]\">[lindex $datadef $opt 1]</option>"
}
for {set i 0} { $i < $max_columns} {incr i} {
Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -r1.65.6.8 -r1.65.6.9
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 2 Oct 2013 22:55:56 -0000 1.65.6.8
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 12 Oct 2013 13:55:18 -0000 1.65.6.9
@@ -149,35 +149,35 @@
Convert line breaks to <p> and <br> tags, respectively.
} {
# Remove any leading or trailing whitespace
- regsub {^[\s]*} $text {} text
- regsub {[\s]*$} $text {} text
+ regsub {^[\s]+} $text {} text
+ regsub {[\s]+$} $text {} text
# Make sure all line breaks are single \n's
regsub -all {\r\n} $text "\n" text
regsub -all {\r} $text "\n" text
# Remove whitespace before \n's
- regsub -all {[ \t]*\n} $text "\n" text
+ regsub -all {[ \t]+\n} $text "\n" text
# Wrap P's around paragraphs
- regsub -all {([^\n\s])\n\n([^\n\s])} $text {\1<p>\2} text
+ regsub -all {([^\n\s])\n\n+([^\n\s])} $text {\1<p>\2} text
- # Convert _single_ CRLF's to <br>'s to preserve line breaks
- # Lars: This must be done after we've made P tags, because otherwise the line
- # breaks will already have been converted into BR's.
-
# remove line breaks right before and after HTML tags that will insert a paragraph break themselves
if { $includes_html_p } {
- foreach tag { ul ol li blockquote p div table tr td th } {
- regsub -all -nocase "\\n\\s*(</?${tag}\\s*\[^>\]*>)" $text {\1} text
- regsub -all -nocase "(</?${tag}\\s*\[^>\]*>)\\s*\\n" $text {\1} text
- }
+ set tags [join { ul ol li blockquote p div table tr td th } |]
+ regsub -all -nocase "\\s*(</?($tags)\\s*\[^>\]*>)\\s*" $text {\1} text
+
+ #foreach tag { ul ol li blockquote p div table tr td th } {
+ # regsub -all -nocase "\\n\\s*(</?${tag}\\s*\[^>\]*>)" $text {\1} text
+ # regsub -all -nocase "(</?${tag}\\s*\[^>\]*>)\\s*\\n" $text {\1} text
+ #}
}
+ # Convert _single_ CRLF's to <br>'s to preserve line breaks
regsub -all {\n} $text "<br>\n" text
# Add line breaks to P tags
- regsub -all {</p>} $text "</p>\n" text
+ #regsub -all {</p>} $text "</p>\n" text
return $text
}
@@ -644,7 +644,7 @@
# Loop over the attributes.
# We maintain counter is so that we don't accidentally enter an infinite loop
set count 0
- while { $i < [string length $html] && ![string equal [string index $html $i] {>}] } {
+ while { $i < [string length $html] && [string index $html $i] ne ">" } {
if { [incr count] > 3000 } {
error "There appears to be a programming bug in ad_parse_html_attributes_upvar: We've entered an infinite loop. We are here: \noffset $i: [string range $html $i $i+60]"
}
@@ -1321,7 +1321,7 @@
incr i
if { $match_p } {
# remove trailing semicolon
- if { [string equal [string index $html $i] {;}] } {
+ if {[string index $html $i] eq ";"} {
set html [string replace $html $i $i]
}
}
@@ -1593,7 +1593,7 @@
@author Lars Pind (lars@pinds.com)
@creation-date 19 July 2000
} {
- if {$html_p eq "t"} {
+ if {$html_p == "t"} {
set from "text/html"
} else {
set from "text/plain"
@@ -1614,7 +1614,7 @@
@author Lars Pind (lars@pinds.com)
@creation-date 19 July 2000
} {
- if {$html_p eq "t"} {
+ if {$html_p == "t"} {
set from "text/html"
} else {
set from "text/plain"
@@ -1770,7 +1770,7 @@
@see ad_convert_to_html
} {
- if { $html_p eq "t" } {
+ if { $html_p == "t" } {
return $raw_string
} else {
return [ad_text_to_html $raw_string]
Index: openacs-4/packages/acs-tcl/tcl/util-diff-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/util-diff-procs.tcl,v
diff -u -r1.3 -r1.3.8.1
--- openacs-4/packages/acs-tcl/tcl/util-diff-procs.tcl 31 Oct 2008 08:50:42 -0000 1.3
+++ openacs-4/packages/acs-tcl/tcl/util-diff-procs.tcl 12 Oct 2013 13:55:18 -0000 1.3.8.1
@@ -37,10 +37,9 @@
foreach chunk $result {
ns_log notice "\n$chunk\n"
set action [lindex $chunk 0]
- set old_index1 [lindex [lindex $chunk 1] 0]
- set old_index2 [lindex [lindex $chunk 1] 1]
- set new_index1 [lindex [lindex $chunk 2] 0]
- set new_index2 [lindex [lindex $chunk 2] 1]
+
+ lassign [lindex $chunk 1] old_index1 old_index2
+ lassign [lindex $chunk 2] new_index1 new_index2
while {$i < $old_index1} {
lappend output [lindex $old $i]
@@ -180,10 +179,10 @@
foreach chunk $result {
set action [lindex $chunk 0]
- set old_index1 [lindex [lindex $chunk 1] 0]
- set old_index2 [lindex [lindex $chunk 1] 1]
- set new_index1 [lindex [lindex $chunk 2] 0]
- set new_index2 [lindex [lindex $chunk 2] 1]
+
+ lassign [lindex $chunk 1] old_index1 old_index2
+ lassign [lindex $chunk 2] new_index1 new_index2
+
while {$i < $old_index1} {
lappend output [lindex $old_list $i]
incr i
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 -r1.133.2.27 -r1.133.2.28
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 10 Oct 2013 20:44:08 -0000 1.133.2.27
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 12 Oct 2013 13:55:18 -0000 1.133.2.28
@@ -1827,7 +1827,7 @@
any added to outputheaders.
} {
- if {[string match "text/*" $content_type] && ![string match *charset=* $content_type]} {
+ if {[string match "text/*" $content_type] && ![string match "*charset=*" $content_type]} {
append content_type "; charset=[ns_config ns/parameters OutputCharset iso-8859-1]"
}
@@ -2222,14 +2222,17 @@
set excluded_vars_list ""
set excluded_vars_url ""
for { set i 0 } { $i < [llength $excluded_vars] } { incr i } {
- set item [lindex [lindex $excluded_vars $i] 0]
- set value [lindex [lindex $excluded_vars $i] 1]
+
+ lassign [lindex $excluded_vars $i] item value
+
if { $value eq "" } {
+ set level [template::adp_level]
# Obtain value from adp level
- upvar #[template::adp_level] __item item_reference
+ upvar #$level \
+ __item item_reference \
+ __value value_reference
set item_reference $item
- upvar #[template::adp_level] __value value_reference
- uplevel #[template::adp_level] {set __value [expr {$$__item}]}
+ uplevel #$level {set __value [set $__item]}
set value $value_reference
}
lappend excluded_vars_list $item
@@ -2335,7 +2338,7 @@
set use_metarefresh_p 0
set headers [ns_conn headers]
set type [ns_set iget $headers content-type]
- if { [string match *multipart/form-data* [string tolower $type]] } {
+ if { [string match "*multipart/form-data*" [string tolower $type]] } {
set user_agent [ns_set iget $headers User-Agent]
set use_metarefresh_p [string match -nocase "*msie 5.0*" $user_agent]
}
@@ -3340,7 +3343,7 @@
set filename [file tail $file]
}
- if {[string equal */* $mime_type] || $mime_type eq ""} {
+ if {"*/*" eq $mime_type || $mime_type eq ""} {
set mime_type [ns_guesstype $file]
}
}
@@ -3357,10 +3360,10 @@
error "Cannot upload file without specifing -filename"
}
- if {[string equal $mime_type */*] || $mime_type eq ""} {
+ if {$mime_type eq "*/*" || $mime_type eq ""} {
set mime_type [ns_guesstype $filename]
- if {[string equal $mime_type */*] || $mime_type eq ""} {
+ if {$mime_type eq "*/*" || $mime_type eq ""} {
set mime_type application/octet-stream
}
}
@@ -4032,7 +4035,7 @@
<pre>
} {
- if { [string match *..* $value] } {
+ if { [string match "*..*" $value] } {
return 0
} else {
return 1
@@ -4108,7 +4111,7 @@
<pre>
} {
- if { [string match *'* $value] } {
+ if { [string match "*'*" $value] } {
return 0
} else {
return 1
Index: openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl,v
diff -u -r1.3.10.5 -r1.3.10.6
--- openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl 10 Oct 2013 20:44:08 -0000 1.3.10.5
+++ openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl 12 Oct 2013 13:55:18 -0000 1.3.10.6
@@ -994,7 +994,7 @@
eval $spec
# Peel off the outer seq, its redundant
- return [lindex [lindex $var(stack) 1] 0]
+ return [lindex $var(stack) 1 0]
}
# sgml::CModelSTname --
@@ -1276,23 +1276,23 @@
proc sgml::followpos {state st firstpos lastpos} {
upvar #0 $state var
- switch -- [lindex [lindex $st 1] 0] {
+ switch -- [lindex $st 1 0] {
:seq {
for {set i 1} {$i < [llength [lindex $st 1]]} {incr i} {
- followpos $state [lindex [lindex $st 1] $i] \
- [lindex [lindex $firstpos 0] $i-1] \
- [lindex [lindex $lastpos 0] $i-1]
- foreach pos [lindex [lindex [lindex $lastpos 0] $i-1] 1] {
- lappend var($pos) {*}[lindex [lindex [lindex $firstpos 0] $i] 1]
+ followpos $state [lindex $st 1 $i] \
+ [lindex $firstpos 0 $i-1] \
+ [lindex $lastpos 0 $i-1]
+ foreach pos [lindex $lastpos 0 $i-1 1] {
+ lappend var($pos) {*}[lindex $firstpos 0 $i 1]
set var($pos) [makeSet $var($pos)]
}
}
}
:choice {
for {set i 1} {$i < [llength [lindex $st 1]]} {incr i} {
- followpos $state [lindex [lindex $st 1] $i] \
- [lindex [lindex $firstpos 0] $i-1] \
- [lindex [lindex $lastpos 0] $i-1]
+ followpos $state [lindex $st 1 $i] \
+ [lindex $firstpos 0 $i-1] \
+ [lindex $lastpos 0 $i-1]
}
}
default {
@@ -1336,11 +1336,11 @@
set firstpos {}
set lastpos {}
- switch -- [lindex [lindex $t 1] 0] {
+ switch -- [lindex $t 1 0] {
:seq -
:choice {
set rep [lindex $t 0]
- set cs [lindex [lindex $t 1] 0]
+ set cs [lindex $t 1 0]
foreach child [lrange [lindex $t 1] 1 end] {
foreach {childNullable childFirstpos childLastpos} \
@@ -1354,8 +1354,8 @@
}
default {
incr var(number)
- set rep [lindex [lindex $t 0] 0]
- set name [lindex [lindex $t 1] 0]
+ set rep [lindex $t 0 0]
+ set name [lindex $t 1 0]
eval $leaf
}
}
@@ -1378,10 +1378,10 @@
proc sgml::firstpos {cs firstpos nullable} {
switch -- $cs {
:seq {
- set result [lindex [lindex $firstpos 0] 1]
+ set result [lindex $firstpos 0 1]
for {set i 0} {$i < [llength $nullable]} {incr i} {
- if {[lindex [lindex $nullable $i] 1]} {
- lappend result {*}[lindex [lindex $firstpos $i+1] 1]
+ if {[lindex $nullable $i 1]} {
+ lappend result {*}[lindex $firstpos $i+1 1]
} else {
break
}
@@ -1413,10 +1413,10 @@
proc sgml::lastpos {cs lastpos nullable} {
switch -- $cs {
:seq {
- set result [lindex [lindex $lastpos end] 1]
+ set result [lindex $lastpos end 1]
for {set i [expr {[llength $nullable] - 1}]} {$i >= 0} {incr i -1} {
- if {[lindex [lindex $nullable $i] 1]} {
- lappend result {*}[lindex [lindex $lastpos $i] 1]
+ if {[lindex $nullable $i 1]} {
+ lappend result {*}[lindex $lastpos $i 1]
} else {
break
}
Index: openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl,v
diff -u -r1.3.10.5 -r1.3.10.6
--- openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl 10 Oct 2013 21:32:34 -0000 1.3.10.5
+++ openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl 12 Oct 2013 13:55:19 -0000 1.3.10.6
@@ -1745,9 +1745,9 @@
# Handle special characters
regsub -all < $value {\<} value
- if {![string match *\"* $value]} {
+ if {![string match "*\"*" $value]} {
append result \"$value\"
- } elseif {![string match *'* $value]} {
+ } elseif {![string match "*'*" $value]} {
append result '$value'
} else {
regsub -all \" $value {\"} value
Index: openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl 17 Oct 2010 21:06:09 -0000 1.9
+++ openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl 12 Oct 2013 13:55:19 -0000 1.9.4.1
@@ -59,7 +59,7 @@
#inspect every tcl file in the directory tree starting with $startdir
foreach file [ad_find_all_files -check_file_func ::tcl_p $startdir] {
- if {[string match */acs-tcl/tcl/test/file-test-procs.tcl $file]} continue
+ if {[string match "*/acs-tcl/tcl/test/file-test-procs.tcl" $file]} continue
set fp [open $file "r"]
set data [read $fp]
@@ -87,7 +87,7 @@
set errp 1
} else {
regexp {packages/([^/]*)/} $spec_file match key
- if {![string equal $version(package.key) $key]} {
+ if {$version(package.key) ne $key } {
aa_log_result fail "MISMATCH DIRECTORY/PACKAGE KEY: $spec_file $version(package.key) != $key"
set errp 1
}
@@ -97,11 +97,11 @@
aa_log_result fail "$spec_file SERVICE MISSING PROVIDES: $key"
set errp 1
} elseif { $version(provides) ne ""} {
- if { ![string equal $version(name) [lindex [lindex $version(provides) 0] 1]]} {
+ if { $version(name) ne [lindex $version(provides) 0 1] } {
aa_log_result fail "$spec_file: MISMATCH PROVIDES VERSION: $version(provides) $version(name)"
set errp 1
}
- if { ![string equal $key [lindex [lindex $version(provides) 0] 0]]} {
+ if { $key ne [lindex $version(provides) 0 0] } {
aa_log_result fail "$spec_file MISMATCH PROVIDES KEY: $key $version(provides)"
set errp 1
}
Index: openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl,v
diff -u -r1.6 -r1.6.8.1
--- openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl 10 Feb 2009 20:42:43 -0000 1.6
+++ openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl 12 Oct 2013 13:55:19 -0000 1.6.8.1
@@ -61,7 +61,7 @@
set separator "-"
aa_log "List with three references:\n\n$c\nseparator= \" - \" "
- aa_equals "" [ad_context_bar_html -separator $separator $ref_list] "<a href=\"[lindex [lindex $ref_list 0] 0]\">[lindex [lindex $ref_list 0] 1]</a> - <a href=\"[lindex [lindex $ref_list 1] 0]\">[lindex [lindex $ref_list 1] 1]</a> - [lindex [lindex $ref_list 2] 0] [lindex [lindex $ref_list 2] 1]"
+ aa_equals "" [ad_context_bar_html -separator $separator $ref_list] "<a href=\"[lindex $ref_list 0 0]\">[lindex $ref_list 0 1]</a> - <a href=\"[lindex $ref_list 1 0]\">[lindex $ref_list 1 1]</a> - [lindex $ref_list 2 0] [lindex $ref_list 2 1]"
}