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.12 -r1.13 --- openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 3 Jul 2018 17:58:48 -0000 1.12 +++ openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 4 Jul 2018 12:14:35 -0000 1.13 @@ -17,7 +17,7 @@ if { $dbn eq "" } { set dbn $::acs::default_database } - return [nsv_get db_available_pools $dbn] + return $::acs::db_pools($dbn) } ad_proc -private db_pool_to_dbn_init {} { @@ -29,7 +29,7 @@ @see db_driverkey } { - foreach dbn [nsv_array names db_available_pools] { + foreach dbn [array names ::acs::db_pools] { foreach pool [db_available_pools $dbn] { nsv_set db_pool_to_dbn $pool $dbn set ::acs::db_pool_to_dbn($pool) $dbn @@ -134,7 +134,7 @@ # all_pools to ensure that the pool is valid. set dbn_pools [ns_config $config_path "pools_${dbn}"] - nsv_set db_available_pools $dbn $dbn_pools + set ::acs::db_pools($default_dbn) $dbn_pools ns_log Notice "$proc_name: For database '$dbn', the following pools are available: $dbn_pools" } @@ -163,13 +163,12 @@ } } } - - nsv_set {db_available_pools} $default_dbn $dbn_pools + set ::acs::db_pools($default_dbn) $dbn_pools } set pools [db_available_pools {}] if { [llength $pools] <= 0 } { - nsv_set {db_available_pools} $default_dbn $all_pools + set ::acs::db_pools($default_dbn) $all_pools set pools $all_pools ns_log Notice "$proc_name: Using ALL database pools for OpenACS." }