Index: openacs-4/bin/create-tablespace.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/bin/create-tablespace.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/bin/create-tablespace.tcl 13 Mar 2003 06:09:04 -0000 1.1 +++ openacs-4/bin/create-tablespace.tcl 10 Jan 2007 21:21:58 -0000 1.2 @@ -50,7 +50,7 @@ } else { # oracle_data_path specified. make sure it has a trailing slash. set oracle_data_path [lindex $argv 2] - if { [string index $oracle_data_path end] != "/" } { + if { [string index $oracle_data_path end] ne "/" } { set oracle_data_path "${oracle_data_path}/" } } Index: openacs-4/etc/config.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/config.tcl,v diff -u -N -r1.40 -r1.41 --- openacs-4/etc/config.tcl 30 Oct 2006 12:16:16 -0000 1.40 +++ openacs-4/etc/config.tcl 10 Jan 2007 21:21:58 -0000 1.41 @@ -36,7 +36,7 @@ set db_name $server -if { $database == "oracle" } { +if { $database eq "oracle" } { set db_password "mysitepassword" } else { set db_host localhost @@ -101,7 +101,7 @@ ns_section ns/threads ns_param mutexmeter true ;# measure lock contention # The per-thread stack size must be a multiple of 8k for AOLServer to run under MacOS X - ns_param stacksize [expr 128 * 8192] + ns_param stacksize [expr {128 * 8192}] # # MIME types. @@ -505,13 +505,13 @@ # #--------------------------------------------------------------------- ns_section "ns/db/drivers" -if { $database == "oracle" } { +if { $database eq "oracle" } { ns_param ora8 ${bindir}/ora8.so } else { ns_param postgres ${bindir}/nspostgres.so ;# Load PostgreSQL driver } -if { $database == "oracle" } { +if { $database eq "oracle" } { ns_section "ns/db/driver/ora8" ns_param maxStringLogLength -1 ns_param LobBufferSize 32768 @@ -539,7 +539,7 @@ ns_param verbose $debug ns_param extendedtableinfo true ns_param logsqlerrors $debug - if { $database == "oracle" } { + if { $database eq "oracle" } { ns_param driver ora8 ns_param datasource {} ns_param user $db_name @@ -558,7 +558,7 @@ ns_param verbose $debug ns_param extendedtableinfo true ns_param logsqlerrors $debug - if { $database == "oracle" } { + if { $database eq "oracle" } { ns_param driver ora8 ns_param datasource {} ns_param user $db_name @@ -577,7 +577,7 @@ ns_param verbose $debug ns_param extendedtableinfo true ns_param logsqlerrors $debug - if { $database == "oracle" } { + if { $database eq "oracle" } { ns_param driver ora8 ns_param datasource {} ns_param user $db_name Index: openacs-4/etc/install/tcl/acs-lang-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/acs-lang-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/etc/install/tcl/acs-lang-procs.tcl 23 Oct 2003 12:35:01 -0000 1.4 +++ openacs-4/etc/install/tcl/acs-lang-procs.tcl 10 Jan 2007 21:21:59 -0000 1.5 @@ -12,7 +12,7 @@ Enables all locales, or a given list of locales, and loads all message catalogs for those locales. } { - if { [empty_string_p $locales] } { + if { $locales eq "" } { set locales [::twt::oacs::eval {db_list all_locales {select locale from ad_locales}}] } Index: openacs-4/etc/install/tcl/admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/admin-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/etc/install/tcl/admin-procs.tcl 12 Oct 2003 01:10:13 -0000 1.3 +++ openacs-4/etc/install/tcl/admin-procs.tcl 10 Jan 2007 21:21:59 -0000 1.4 @@ -83,7 +83,7 @@ ::twt::do_request "$server_url/admin/site-map" link follow ~u {parameter-set\?package%5fid=[0-9]+&package%5fkey=acs%2dkernel} - if { ![string equal $param_section "acs-kernel"] } { + if { $param_section ne "acs-kernel" } { link follow ~c "$param_section" } Index: openacs-4/etc/install/tcl/class-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/class-procs.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/etc/install/tcl/class-procs.tcl 29 Oct 2003 14:38:09 -0000 1.6 +++ openacs-4/etc/install/tcl/class-procs.tcl 10 Jan 2007 21:21:59 -0000 1.7 @@ -79,7 +79,7 @@ set admin_rels [list dotlrn_ta_rel dotlrn_cadmin_rel dotlrn_ca_rel] set admin_counter 0 for { set admin_counter 0 } \ - { [expr $admin_counter < 2 && $admin_counter < [llength $admin_users]] } \ + { [expr {$admin_counter < 2 && $admin_counter < [llength $admin_users]}] } \ { incr admin_counter } { set admin_rel [::twt::get_random_items_from_list $admin_rels 1] @@ -96,7 +96,7 @@ ad_proc ::twt::class::add_member { email rel_type } { - if { [empty_string_p $email] } { + if { $email eq "" } { return } Index: openacs-4/etc/install/tcl/dotlrn-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/dotlrn-procs.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/etc/install/tcl/dotlrn-procs.tcl 5 Jan 2004 12:26:55 -0000 1.11 +++ openacs-4/etc/install/tcl/dotlrn-procs.tcl 10 Jan 2007 21:21:59 -0000 1.12 @@ -265,5 +265,5 @@ ::twt::assert_equals \ "Should be one less class to dergister from after deregistering" \ $deregister_count_after \ - [expr $deregister_count_before - 1] + [expr {$deregister_count_before - 1}] } Index: openacs-4/etc/install/tcl/twt-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/twt-procs.tcl,v diff -u -N -r1.17 -r1.18 --- openacs-4/etc/install/tcl/twt-procs.tcl 26 Nov 2003 16:27:28 -0000 1.17 +++ openacs-4/etc/install/tcl/twt-procs.tcl 10 Jan 2007 21:21:59 -0000 1.18 @@ -36,7 +36,7 @@ } ad_proc ::twt::assert_equals { explanation actual_value expected_value } { - if { ![string equal $actual_value $expected_value] } { + if { $actual_value ne $expected_value } { ::twt::log_alert "Assertion \"$explanation\" failed: actual_value=\"$actual_value\", expected_value=\"$expected_value\"" } } @@ -98,7 +98,7 @@ set errno [catch { array set link_array [link find -next ~u "$link_url_pattern"]} error] - if { [string equal $errno "0"] } { + if {$errno eq "0"} { set url $link_array(url) lappend urls_list $url @@ -158,7 +158,7 @@ Given an integer N, return an integer between 0 and N. } { - return [expr int([expr rand()] * $range)] + return [expr int([expr {rand()}] * $range)] } ad_proc ::twt::write_response_to_file { filename } { @@ -252,7 +252,7 @@ @author Peter Marklund } { - if { ![empty_string_p $previous_url] } { + if { $previous_url ne "" } { # For relative links to work, when we come back from the recursive crawling of a link, we need to make # Tclwebtest understand that we are now relative to a different URL than the one last requested, namely # relative to the URL of the page the link is on. @@ -298,7 +298,7 @@ # Note that we are re-initializing start_url_absolute here since a trailing slash will be added if the URL is a directory # and we need that to resolve relative URLs if { [catch {set foobar [::twt::do_request $start_url_absolute]} errmsg] } { - if { ![string equal "$previous_url" ""] } { + if { "$previous_url" ne "" } { set previous_page_message " (link found on page $previous_url)" } else { set previous_page_message "" @@ -324,16 +324,16 @@ # Don't revisit URL:s we have already tested # Don't follow relative anchors on pages - can't get them to work with TclWebtest - set new_url_p [expr [lsearch -exact $__url_history $absolute_url] == -1] + set new_url_p [expr {[lsearch -exact $__url_history $absolute_url] == -1}] if { [string range $url 0 0] == "#" } { set anchor_link_p 1 } else { set anchor_link_p 0 } #::twt::log "pm debug under_start_url_p - string first $start_url_absolute $absolute_url" - set under_start_url_p [expr [string first $start_url_absolute $absolute_url] != -1] + set under_start_url_p [expr {[string first $start_url_absolute $absolute_url] != -1}] - set visit_p [expr $new_url_p && !$anchor_link_p && $under_start_url_p] + set visit_p [expr {$new_url_p && !$anchor_link_p && $under_start_url_p}] if { $visit_p } { crawl_links -previous_url $start_url_absolute $url } @@ -353,7 +353,7 @@ set field_choices $current_field(choices) set index 0 foreach field_choice $field_choices { - if { [string equal $value [lindex $field_choice 0]] } { + if {$value eq [lindex $field_choice 0]} { break } incr index Index: openacs-4/etc/install/tcl/user-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/user-procs.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/etc/install/tcl/user-procs.tcl 2 Mar 2004 09:10:36 -0000 1.9 +++ openacs-4/etc/install/tcl/user-procs.tcl 10 Jan 2007 21:21:59 -0000 1.10 @@ -12,7 +12,7 @@ set user_emails [list] foreach user_data [get_test_data] { - if { [empty_string_p $type] || \ + if { $type eq "" || \ [string equal -nocase [lindex $user_data 4] $type] } { lappend user_emails [lindex $user_data 2] @@ -32,7 +32,7 @@ ad_proc ::twt::user::get_password { email } { - if { [string equal $email [::twt::config::admin_email]] } { + if {$email eq [::twt::config::admin_email]} { return [::twt::config::admin_password] } else { global __demo_users_password Index: openacs-4/etc/keepalive/keepalive-config.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/keepalive/keepalive-config.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/etc/keepalive/keepalive-config.tcl 4 Jun 2006 00:45:19 -0000 1.3 +++ openacs-4/etc/keepalive/keepalive-config.tcl 10 Jan 2007 21:21:59 -0000 1.4 @@ -9,7 +9,7 @@ set servers_to_monitor {} # How long the keepalive script waits until it attempts another restart -set seconds_between_restarts [expr 10*60] +set seconds_between_restarts [expr {10*60}] # Who shall we email if the server is/cannot be restarted? set mailto root Index: openacs-4/packages/acs-admin/lib/become.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/become.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/lib/become.tcl 13 Jan 2005 13:54:41 -0000 1.2 +++ openacs-4/packages/acs-admin/lib/become.tcl 10 Jan 2007 21:21:59 -0000 1.3 @@ -14,7 +14,7 @@ # Get the password and user ID -if ![db_0or1row password "select password from users where user_id=$user_id"] { +if {![db_0or1row password "select password from users where user_id=$user_id"]} { ad_return_error "Couldn't find user $user_id" "Couldn't find user $user_id." return } Index: openacs-4/packages/acs-admin/lib/password-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/password-update.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/lib/password-update.tcl 13 Jan 2005 13:54:41 -0000 1.2 +++ openacs-4/packages/acs-admin/lib/password-update.tcl 10 Jan 2007 21:21:59 -0000 1.3 @@ -81,12 +81,12 @@ } # If the account was closed, it might be open now - if { [string equal [ad_conn account_status] "closed"] } { + if {[ad_conn account_status] eq "closed"} { auth::verify_account_status } } -after_submit { - if { [empty_string_p $return_url] } { + if { $return_url eq "" } { set return_url [ad_pvt_home] set pvt_home_name [ad_pvt_home_name] set continue_label [_ acs-subsite.Continue_to_your_account] Index: openacs-4/packages/acs-admin/lib/service-parameters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/service-parameters.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-admin/lib/service-parameters.tcl 23 Jan 2004 14:29:25 -0000 1.5 +++ openacs-4/packages/acs-admin/lib/service-parameters.tcl 10 Jan 2007 21:21:59 -0000 1.6 @@ -16,7 +16,7 @@ if { [file exists "[acs_package_root_dir $package_key]/www/"] } { catch { set url [apm_package_url_from_key $package_key] - if { ![empty_string_p $url] && [file exists "[acs_package_root_dir $package_key]/www/admin/"] } { + if { $url ne "" && [file exists "[acs_package_root_dir $package_key]/www/admin/"] } { set admin_url "${url}admin/" } if { [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"] } { @@ -30,7 +30,7 @@ } set instance_name [lang::util::localize $instance_name] - if { [empty_string_p $url] && [empty_string_p $admin_url] && [empty_string_p $param_url] } { + if { $url eq "" && $admin_url eq "" && $param_url eq "" } { continue } } Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 6 Jul 2006 11:29:01 -0000 1.14 +++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 10 Jan 2007 21:21:59 -0000 1.15 @@ -22,7 +22,7 @@ lappend section_list [list $package_key $package_key [list "where" "section_name is null"]] foreach section $sections { incr i - if { ![empty_string_p $section] } { + if { $section ne "" } { lappend section_list [list "section_$i" $section [list "where" "section_name = '[db_quote $section]'"]] } } @@ -63,7 +63,7 @@ } set header [ad_header $title ""] append body "$header\n" - if {![empty_string_p $form]} { + if {$form ne ""} { append body "
" } @@ -103,7 +103,7 @@ only the enable checkbox will be displayed, and the resulting page is expected to assume that enable also means install. } { - if {[empty_string_p $pkg_info_list]} { + if {$pkg_info_list eq ""} { return "" } @@ -128,7 +128,7 @@ append widget " " - if { ![string compare [pkg_info_dependency_p $pkg_info] "t"]} { + if { [pkg_info_dependency_p $pkg_info] eq "t" } { # Dependency passed. if { $install_enable_p } { @@ -162,7 +162,7 @@ $package_rel_path Dependencies satisfied. " - } elseif { ![string compare [pkg_info_dependency_p $pkg_info] "f"] } { + } elseif { [pkg_info_dependency_p $pkg_info] eq "f" } { #Dependency failed. if { $install_enable_p } { append widget " $path_pretty" Index: openacs-4/packages/acs-admin/www/send-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/send-email.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/send-email.tcl 30 Nov 2002 17:12:49 -0000 1.2 +++ openacs-4/packages/acs-admin/www/send-email.tcl 10 Jan 2007 21:21:59 -0000 1.3 @@ -23,13 +23,13 @@ return_url:onevalue } -if [catch {ns_sendmail $email $email_from $subject $message} errmsg] { +if {[catch {ns_sendmail $email $email_from $subject $message} errmsg]} { ad_return_error $error_subject "$error_message: 
[ad_quotehtml $errmsg]
" ad_script_abort } -if { $show_sent_message_p != "t" } { +if { $show_sent_message_p ne "t" } { # Do not show any message. Just go to return url ad_returnredirect $return_url ad_script_abort Index: openacs-4/packages/acs-admin/www/apm/build-repository.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/build-repository.tcl,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/acs-admin/www/apm/build-repository.tcl 21 May 2004 11:00:29 -0000 1.15 +++ openacs-4/packages/acs-admin/www/apm/build-repository.tcl 10 Jan 2007 21:21:59 -0000 1.16 @@ -131,7 +131,7 @@ foreach { cur_work_dir cur_cvs_root cur_module } $checkout_list { cd $cur_work_dir - if { ![string equal $channel_tag($channel) HEAD] } { + if { $channel_tag($channel) ne "HEAD" } { ns_write "
  • Checking out $cur_module from CVS:" catch { exec $cvs_command -d $cur_cvs_root -z3 co -r $channel_tag($channel) $cur_module } output ns_write " [llength $output] files\n" Index: openacs-4/packages/acs-admin/www/apm/cvs-status.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/cvs-status.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-admin/www/apm/cvs-status.tcl 24 Sep 2003 18:23:36 -0000 1.3 +++ openacs-4/packages/acs-admin/www/apm/cvs-status.tcl 10 Jan 2007 21:21:59 -0000 1.4 @@ -37,7 +37,7 @@ global vc_file_props if { [regexp {[a-zA-Z]} $vc_file_props(status)] } { set status "$vc_file_props(status)" - if { ![string compare $status "Up-to-date"] } { + if { $status eq "Up-to-date" } { # It's up to date; don't print anything out. continue } Index: openacs-4/packages/acs-admin/www/apm/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v diff -u -N -r1.21 -r1.22 --- openacs-4/packages/acs-admin/www/apm/index.tcl 17 May 2004 15:14:41 -0000 1.21 +++ openacs-4/packages/acs-admin/www/apm/index.tcl 10 Jan 2007 21:21:59 -0000 1.22 @@ -61,8 +61,8 @@ { version_name "Ver." "" "" } { status "Status" "" {  [eval { - if { $installed_p == "t" } { - if { $enabled_p == "t" } { + if { $installed_p eq "t" } { + if { $enabled_p eq "t" } { set status "Enabled" } else { set status "Disabled" @@ -82,7 +82,7 @@ set file_link_list [list] lappend file_link_list "view files" - if { $installed_p == "t" && $enabled_p == "t" } { + if { $installed_p eq "t" && $enabled_p eq "t" } { if { ! [ad_parameter -package_id [ad_acs_kernel_id] PerformanceModeP request-processor 1] } { lappend file_link_list "watch all files" } @@ -139,7 +139,7 @@ append body "

    Watches