Changeset 22589 for main/trunk/greenstone2/bin/script

Timestamp:

2010-08-09T15:14:58+12:00 (14 years ago)

Author:

kjdon

Message:

at the end of import it checks for existence of archiveinf-src.gdb to see if imoprting was successful. Need to get infodbtype from collect.cfg so that we look for the right filename extension for this file, as may not always be gdb.

File:

• main/trunk/greenstone2/bin/script/build (modified) (8 diffs)

main/trunk/greenstone2/bin/script/build

@@ -58 +58 @@
 use util;
 use cfgread;
+use colcfg;
+use dbutil;
 
 # set up path - this allows for paths not to be supplied to system calls
@@ -69 +71 @@
 
 # all the input option variables
-my ($optionfile, $indextype, $append, $manifest, $remove_archives, $remove_import, $buildtype, $maxdocs, @download, $collectdir, $site, $dontinstall, $save_archives, $out, $make_writable, $log_events, $event_log_file, $email_events, $mail_server, $statsfile, $event_header);
+my ($optionfile, $indextype, $append, $manifest, $remove_archives, $remove_import, $buildtype, $infodbtype, $maxdocs, @download, $collectdir, $site, $dontinstall, $save_archives, $out, $make_writable, $log_events, $event_log_file, $email_events, $mail_server, $statsfile, $event_header);
 
 &parse_args (\@ARGV);
@@ -99 +101 @@
 
 my $cdir = $collectdir;
+my $gs_mode;
 if (defined $site && $site =~ /\w/)
 {
     die "GSDL3HOME not set." unless $ENV{'GSDL3HOME'};
     $cdir = &util::filename_cat ($ENV{'GSDL3HOME'}, "sites", $site, "collect") unless $collectdir =~ /\w/;
+    $gs_mode = "gs3";
 }
 else
 {
     $cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect") unless $collectdir =~ /\w/;
+    $gs_mode = "gs2";
 }
 
@@ -113 +118 @@
 my $buildingdir = &util::filename_cat ($cdir, $collection, "building");
 my $indexdir = &util::filename_cat ($cdir, $collection, "index");
+my $etcdir = &util::filename_cat ($cdir, $collection, "etc");
 my $bindir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin");
 
@@ -152 +158 @@
     # if we've created a build log we'll copy it to the collection's etc
     # directory
-    my ($etcdir);
+    my ($final_etcdir);
     if ($dontinstall) {
-    $etcdir = &util::filename_cat($collectdir, "etc", "build.log");
+    $final_etcdir = &util::filename_cat($collectdir, "etc", "build.log");
     } else {
-    $etcdir = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "etc", "build.log");
+    $final_etcdir = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "etc", "build.log");
     }
     
-    &util::cp($outfile, $etcdir);
+    &util::cp($outfile, $final_etcdir);
 }
 
@@ -337 +343 @@
     `echo $importdir ; ls $importdir `;
 
-    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir);
+    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)
+    $infodbtype = $collect_cfg->{'infodbtype'} || &dbutil::get_default_infodb_type();
+
+    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archivedir);
     if (-e $archiveinf_doc_file_path) {
     if (&has_content ($importdir)) {
@@ -463 +480 @@
     &append_file ($out, "$outfile.import");
 
-    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir);
+    my $archiveinf_doc_file_path = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archivedir);
+
     if (-e $archiveinf_doc_file_path) {
     print $out "$collection collection imported successfully\n\n";
@@ -471 +489 @@
     }
     } else {
+    print $out "$archiveinf_doc_file_path not found. archives contents:\n";
     print $out `ls $archivedir`;