Index: openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 14 Apr 2005 17:33:38 -0000 1.7 +++ openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 10 Jan 2007 21:22:03 -0000 1.8 @@ -14,7 +14,7 @@ @author Andrew Piskorski (atp@piskorski.com) @creation-date 2003/03/16 } { - if { [empty_string_p $dbn] } { + if { $dbn eq "" } { set dbn [nsv_get {db_default_database} .] } return [nsv_get {db_available_pools} $dbn] @@ -124,7 +124,7 @@ set old_availablepool_p 0 set default_dbn [lindex $database_names 0] - if { [empty_string_p $default_dbn] } { + if { $default_dbn eq "" } { set default_dbn {default} set old_availablepool_p 1 @@ -155,7 +155,7 @@ set dbn_pools [list] set the_set [ns_configsection $config_path] - if { [string length $the_set] > 0 } { + if { $the_set ne "" } { for {set i 0} {$i < [ns_set size $the_set]} {incr i} { if { [string tolower [ns_set key $the_set $i]] == "availablepool" } { lappend dbn_pools [ns_set value $the_set $i] @@ -207,7 +207,7 @@ set bad_pools [list] set long_error 0 foreach pool $pools { - if { [catch { set db [ns_db gethandle -timeout 15 $pool]}] || ![string compare $db ""] } { + if { [catch { set db [ns_db gethandle -timeout 15 $pool]}] || $db eq "" } { ns_log Warning "$proc_name: couldn't allocate a handle from database pool \"$pool\"." lappend bad_pools "
  • OpenACS could not allocate a handle from database pool \"$pool\"." set long_error 1 @@ -232,12 +232,12 @@ } ns_db releasehandle $db - if { [string length $this_suffix] == 0 } { + if { $this_suffix eq "" } { ns_log Notice "$proc_name: couldn't determine RDBMS type of database pool \"$pool\"." lappend bad_pools "
  • OpenACS could not determine the RDBMS type associated with pool \"$pool\"." set long_error 1 - } elseif { [string length [nsv_get ad_database_type .]] == 0 } { + } elseif { [nsv_get ad_database_type .] eq "" } { nsv_set ad_database_type . $this_suffix } elseif { ![string match $this_suffix [nsv_get ad_database_type .]] } { ns_log Notice "$proc_name: Database pool \"$pool\" type \"$this_suffix\" differs from @@ -249,7 +249,7 @@ } } - if { [string length [nsv_get ad_database_type .]] == 0 } { + if { [nsv_get ad_database_type .] eq "" } { set database_problem "RDBMS type could not be determined for any pool." ns_log Error "$proc_name: RDBMS type could not be determined for any pool." }