Changeset 23052 for main

Timestamp:

2010-10-06T15:32:01+13:00 (14 years ago)

Author:

kjdon

Message:

need to read in collect.cfg or collectionConfig.xml to see what the infodbtype is, in order to determine if we have an existing archives database or not. Can't just assume gdbm

File:

• main/trunk/greenstone2/bin/script/incremental-import.pl (modified) (2 diffs)

main/trunk/greenstone2/bin/script/incremental-import.pl

@@ -95 +95 @@
     print STDERR "Unable to use collection \"$collection\" within \"$collect_dir\"\n";
     exit -1;
-    }   
-
+    }
+    my $gs_mode = "gs2";
+    if ((defined $site) && ($site ne "")) {
+    $gs_mode = "gs3";
+    }
+    
     if (!defined $archive_dir) {
-    $archive_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives")
+    $archive_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives");
     }
-
+    my $etcdir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc");
     # BACKWARDS COMPATIBILITY: Just in case there are old .ldb/.bdb files (won't do anything for other infodbtypes)
     &util::rename_ldb_or_bdb_file(&util::filename_cat($archive_dir, "archiveinf-doc"));
     
-    my $archiveinf_doc = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archive_dir);
+    my $col_cfg_file;
+    if ($gs_mode eq "gs3") {
+    $col_cfg_file = &util::filename_cat($etcdir, "collectionConfig.xml");
+    } else {
+    $col_cfg_file = &util::filename_cat($etcdir, "collect.cfg");
+    }
+
+    my $collect_cfg = &colcfg::read_collection_cfg ($col_cfg_file, $gs_mode);
+    # get the database type for this collection from its configuration file (may be undefined)
+    my $infodbtype = $collect_cfg->{'infodbtype'} || &dbutil::get_default_infodb_type();
+
+    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archive_dir);
 
     my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv);
@@ -121 +136 @@
     }
 
-    if (-e $archiveinf_doc) {
+    if (-e $archiveinf_doc_file_path) {
     $import_cmd .= " -incremental";