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.18 -r1.19 --- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 19 May 2003 10:05:28 -0000 1.18 +++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 12 Jul 2003 01:10:35 -0000 1.19 @@ -46,6 +46,7 @@
  1. Files with extension .sql are considered data-model files, +
  2. Files with extension .csv are considered comma-separated values files. or if any path contains the substring upgrade, data-model upgrade files.
  3. Files with extension .sqlj are considered sqlj_code files. @@ -109,6 +110,8 @@ } else { set type "data_model" } + } elseif { [string equal $extension ".csv"] } { + set type "csv_data" } elseif { [string equal $extension ".sqlj"] } { set type "sqlj_code" } elseif { [string equal $extension ".info"] } { @@ -193,6 +196,7 @@ set file_db_type [apm_guess_db_type $package_key $rel_path] set type_match_p [expr [empty_string_p $file_types] || [lsearch $file_types $file_type] != -1] + if { $all_db_types_p } { set db_match_p 1 } else { @@ -307,6 +311,9 @@ 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 "" + } foreach known_database_type [db_known_database_types] { if { [string equal [lindex $known_database_type 0] $db_dir] } { return $db_dir