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.86.2.3 -r1.86.2.4 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 5 Sep 2013 11:50:59 -0000 1.86.2.3 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 16 Sep 2013 15:48:38 -0000 1.86.2.4 @@ -179,8 +179,8 @@ set handle $dbn ; set dbn {} set pool [ns_db poolname $handle] - if { [nsv_exists {db_pool_to_dbn} $pool] } { - set dbn [nsv_get {db_pool_to_dbn} $pool] + if { [nsv_exists db_pool_to_dbn $pool] } { + set dbn [nsv_get db_pool_to_dbn $pool] } else { # db_pool_to_dbn_init runs on startup, so other than some # broken code deleting the nsv key (very unlikely), the @@ -192,7 +192,7 @@ } } - if { ![nsv_exists {db_driverkey} $dbn] } { + if { ![nsv_exists db_driverkey $dbn] } { # This ASSUMES that any overriding of this default value via # "ns_param driverkey_dbn" has already been done: @@ -209,19 +209,19 @@ if { [string match "Oracle*" $driver] } { set driverkey {oracle} - } elseif { [string equal $driver {PostgreSQL}] } { - set driverkey {postgresql} - } elseif { [string equal $driver {ODBC}] } { - set driverkey {nsodbc} + } elseif { $driver eq "PostgreSQL"] } { + set driverkey "postgresql" + } elseif { $driver eq "ODBC"] } { + set driverkey "nsodbc" } else { set driverkey {} - ns_log Error "$proc_name: Unknown driver '$driver_type'." + ns_log Error "$proc_name: Unknown driver '$driver'." } - nsv_set {db_driverkey} $dbn $driverkey + nsv_set db_driverkey $dbn $driverkey } - return [nsv_get {db_driverkey} $dbn] + return [nsv_get db_driverkey $dbn] }