Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 29 Jul 2001 23:16:50 -0000 1.5 +++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 19 Aug 2001 21:26:05 -0000 1.6 @@ -149,8 +149,11 @@ file used to create the APM datamodel. If the path contains a string matching "sql/common" the file is assumed to be - compatible with all supported RDBMS's and a db_type of "common" is returned. + compatible with all supported RDBMS's and a blank db_type is returned. + Otherwise "oracle" is returned. This is a hardwired kludge to allow us to + handle legacy ACS 4 packages. + 2. Other files. If the file name contains a dash and database type, the file is assumed to be @@ -166,16 +169,13 @@ set sql_index [lsearch $components "sql"] if { $sql_index >= 0 } { set db_dir [lindex $components [expr $sql_index + 1]] - if { [string equal db_dir "common"] } { - return "common" - } foreach known_database_type [db_known_database_types] { if { [string equal [lindex $known_database_type 0] $db_dir] } { return $db_dir } } } - return "" + return "oracle" } set file_name [file tail $path] @@ -184,6 +184,7 @@ return [lindex $known_database_type 0] } } + return "" }