Index: openacs-4/packages/acs-templating/tcl/tag-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-procs.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/acs-templating/tcl/tag-procs.tcl 16 Mar 2005 19:19:17 -0000 1.14 +++ openacs-4/packages/acs-templating/tcl/tag-procs.tcl 10 Jan 2007 21:22:12 -0000 1.15 @@ -74,7 +74,7 @@ for { set i 0 } { $i < $size } { incr i } { set key [ns_set key $params $i] set value [ns_set value $params $i] - if { [string equal $key $value] } { + if {$key eq $value} { lappend tokens $key } else { lappend tokens "$key=$value" @@ -101,7 +101,7 @@ set op [lindex $args 1] - if { $op == "not" } { + if { $op eq "not" } { append condition "! (" set close_paren ")" set op [lindex $args 2] @@ -119,27 +119,27 @@ gt { append condition "$arg1 > \"[lindex $args $i]\"" - set next [expr $i + 1] + set next [expr {$i + 1}] } ge { append condition "$arg1 >= \"[lindex $args $i]\"" - set next [expr $i + 1] + set next [expr {$i + 1}] } lt { append condition "$arg1 < \"[lindex $args $i]\"" - set next [expr $i + 1] + set next [expr {$i + 1}] } le { append condition "$arg1 <= \"[lindex $args $i]\"" - set next [expr $i + 1] + set next [expr {$i + 1}] } eq { append condition "\[string equal $arg1 \"[lindex $args $i]\"\]" - set next [expr $i + 1] + set next [expr {$i + 1}] } ne { append condition "! \[string equal $arg1 \"[lindex $args $i]\"\]" - set next [expr $i + 1] + set next [expr {$i + 1}] } in { @@ -150,9 +150,9 @@ between { set expr1 "$arg1 >= \"[lindex $args $i]\"" - set expr2 "$arg1 <= \"[lindex $args [expr $i + 1]]\"" + set expr2 "$arg1 <= \"[lindex $args [expr {$i + 1}]]\"" append condition "($expr1 && $expr2)" - set next [expr $i + 2] + set next [expr {$i + 2}] } nil { @@ -182,12 +182,12 @@ } odd { - append condition "\[expr $arg1 % 2\]" + append condition "\[expr {$arg1 % 2}\]" set next $i } even { - append condition "! \[expr $arg1 % 2\]" + append condition "! \[expr {$arg1 % 2}\]" set next $i } @@ -204,7 +204,7 @@ default { # treat as a shortcut for append condition "\[template::util::is_true $arg1\]" - set next [expr $i - 1] + set next [expr {$i - 1}] } }