Index: openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl 17 Mar 2003 20:18:32 -0000 1.4
+++ openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl 11 Apr 2003 03:58:09 -0000 1.5
@@ -9,7 +9,7 @@
upvar $errors my_errors
upvar $error_p my_error_p
- foreach pool [db_available_pools] {
+ foreach pool [db_available_pools {}] {
if { [catch { set db [ns_db gethandle -timeout 15 $pool]}] || ![string compare $db ""] } {
# This should never happened - we were able to grab a handle previously, why not now?
append my_errors "(db_bootstrap_checks) Internal error accessing pool \"$pool\".
"
Index: openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl 17 Mar 2003 20:18:32 -0000 1.8
+++ openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl 11 Apr 2003 03:58:09 -0000 1.9
@@ -11,7 +11,7 @@
set my_errors "We found the following problems with your PostgreSQL installation:
@@ -31,7 +31,7 @@ @see db_driverkey } { foreach dbn [nsv_array names {db_available_pools}] { - foreach pool [db_available_pools -dbn $dbn] { + foreach pool [db_available_pools $dbn] { nsv_set {db_pool_to_dbn} $pool $dbn } } @@ -138,7 +138,7 @@ ns_log Notice "$proc_name: For database '$dbn', the following pools are available: $dbn_pools" } - if { [empty_string_p [db_available_pools -dbn $default_dbn]] } { + if { [empty_string_p [db_available_pools $default_dbn]] } { ns_log Error "$proc_name: No pools specified for database '$default_dbn'." set old_availablepool_p 1 } @@ -166,7 +166,7 @@ nsv_set {db_available_pools} $default_dbn $dbn_pools } - set pools [db_available_pools] + set pools [db_available_pools {}] if { [llength $pools] <= 0 } { nsv_set {db_available_pools} $default_dbn $all_pools set pools $all_pools 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.27 -r1.28 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 9 Apr 2003 22:40:42 -0000 1.27 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 11 Apr 2003 03:57:30 -0000 1.28 @@ -429,7 +429,7 @@ @param dbn The database name to use. If empty_string, uses the default database. } { - set available_pools [db_available_pools -dbn $dbn] + set available_pools [db_available_pools $dbn] if { $n < [llength $available_pools] } { set pool [lindex $available_pools $n] @@ -1963,7 +1963,7 @@ @param dbn The database name to use. If empty_string, uses the default database. } { - set pool [lindex [db_available_pools -dbn $dbn] 0] + set pool [lindex [db_available_pools $dbn] 0] return [ns_config "ns/db/pool/$pool" User] } @@ -1973,7 +1973,7 @@ @param dbn The database name to use. If empty_string, uses the default database. } { - set pool [lindex [db_available_pools -dbn $dbn] 0] + set pool [lindex [db_available_pools $dbn] 0] return [ns_config "ns/db/pool/$pool" Password] } @@ -1990,7 +1990,7 @@ @param dbn The database name to use. If empty_string, uses the default database. } { - set pool [lindex [db_available_pools -dbn $dbn] 0] + set pool [lindex [db_available_pools $dbn] 0] set datasource [ns_config "ns/db/pool/$pool" DataSource] if { ![empty_string_p $datasource] && ![string is space $datasource] } { return "[ns_config ns/db/pool/$pool User]/[ns_config ns/db/pool/$pool Password]@$datasource" @@ -2008,7 +2008,7 @@ @param dbn The database name to use. If empty_string, uses the default database. } { - set pool [lindex [db_available_pools -dbn $dbn] 0] + set pool [lindex [db_available_pools $dbn] 0] set driver [ns_config "ns/db/pool/$pool" Driver] return [ns_config "ns/db/driver/$driver" pgbin] } @@ -2025,7 +2025,7 @@ @param dbn The database name to use. If empty_string, uses the default database. } { - set pool [lindex [db_available_pools -dbn $dbn] 0] + set pool [lindex [db_available_pools $dbn] 0] set datasource [ns_config "ns/db/pool/$pool" DataSource] set last_colon_pos [string last ":" $datasource] if { $last_colon_pos == -1 } { @@ -2053,7 +2053,7 @@ @param dbn The database name to use. If empty_string, uses the default database. } { - set pool [lindex [db_available_pools -dbn $dbn] 0] + set pool [lindex [db_available_pools $dbn] 0] set datasource [ns_config "ns/db/pool/$pool" DataSource] set last_colon_pos [string last ":" $datasource] if { $last_colon_pos == -1 } { @@ -2074,7 +2074,7 @@ @param dbn The database name to use. If empty_string, uses the default database. } { - set pool [lindex [db_available_pools -dbn $dbn] 0] + set pool [lindex [db_available_pools $dbn] 0] set datasource [ns_config "ns/db/pool/$pool" DataSource] set first_colon_pos [string first ":" $datasource] if { $first_colon_pos == -1 } {