Changeset 1431 for trunk/gsdl/bin/script/build

Timestamp:

2000-08-20T20:42:28+12:00 (24 years ago)

Author:

sjboddie

Message:

Made a few minor adjustments to perl building code for use with
collectoraction

File:

• trunk/gsdl/bin/script/build (modified) (8 diffs)

trunk/gsdl/bin/script/build

@@ -18 +18 @@
 
 if (!parsargv::parse(\@ARGV, 
+             'append', \$append,
              'remove_archives', \$remove_archives,
              'remove_import', \$remove_import,
@@ -50 +51 @@
 my $bindir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin");
 
-my $close_out = 0;
+my $use_out = 0;
 my $outfile = $out;
 if ($out !~ /^(STDERR|STDOUT)$/i) {
     open (OUT, ">$out") || die "Couldn't open output file $out\n";
     $out = "OUT";
-    $close_out = 1;
+    $use_out = 1;
 }
 $out->autoflush(1);
@@ -61 +62 @@
 &main();
 
-close OUT if $close_out;
+close OUT if $use_out;
 
 sub print_usage {
     print STDERR "\n  usage: $0 [options] collection-name\n\n";
     print STDERR "  options:\n";
+    print STDERR "   -append                 Add new files to existing collection\n";
     print STDERR "   -remove_archives        Remove archives directory after successfully\n";
     print STDERR "                           building the collection.\n";
@@ -89 +91 @@
     if (scalar (@download)) {
     # remove any existing import data
-    &util::rm_r ($importdir) if -d $importdir;
+    if (&has_content ($importdir)) {
+        print $out "build: WARNING: removing contents of $importdir\n";
+        &util::rm_r ($importdir);
+    }
 
     foreach $download_dir (@download) {
@@ -107 +112 @@
             # copy download_dir and all it contains to the import directory
             my $download_cmd = "perl " . &util::filename_cat ($bindir, "script", "filecopy.pl");
-            $download_cmd .= " -out \"$outfile\" \"" . $download_dir . "\" " . $collection;
+            $download_cmd .= " -out \"$outfile.download\"" if $use_out;
+            $download_cmd .= " \"" . $download_dir . "\" " . $collection;
             system ($download_cmd);
+            # if using output directory append the file download output to it
+            &append_file ($out, "$outfile.download");
         } else {
             print $out "WARNING: $download_dir does not exist\n";
@@ -154 +162 @@
     print $out "importing the $collection collection\n\n";
 
-    my $import = &util::filename_cat ($bindir, "script", "import.pl");
-    system ("perl $import -removeold $maxdocs -out \"$outfile\" $collection");
+    my $import_cmd = "perl " . &util::filename_cat ($bindir, "script", "import.pl");
+    $import_cmd .= " -out \"$outfile.import\"" if $use_out;
+    $import_cmd .= " -removeold" unless $append;
+    $import_cmd .= " $maxdocs $collection";
+    system ($import_cmd);
+    # if using output directory append the import output to it
+    &append_file ($out, "$outfile.import");
+
     if (-e &util::filename_cat ($archivedir, "archives.inf")) {
     print $out "$collection collection imported successfully\n\n";
@@ -171 +185 @@
     print $out "building the $collection collection\n\n";
 
-    my $buildcol = &util::filename_cat ($bindir, "script", "buildcol.pl");
-    system ("perl $buildcol $maxdocs -out \"$outfile\" $collection");
+    my $build_cmd = "perl " . &util::filename_cat ($bindir, "script", "buildcol.pl");
+    $build_cmd .= " -out \"$outfile.build\"" if $use_out;
+    $build_cmd .= " $maxdocs $collection";
+    system ($build_cmd);
+    # if using output directory append the buildcol output to it
+    &append_file ($out, "$outfile.build");
+
     if (-e &util::filename_cat ($buildingdir, "text", "$collection.ldb") ||
     -e &util::filename_cat ($buildingdir, "text", "$collection.bdb")) {
@@ -209 +228 @@
     return 0;
 }
+
+sub append_file {
+    my ($handle, $file) = @_;
+
+    open (FILE, $file) || return;
+    undef $/;
+    print $handle <FILE>;
+    $/ = "\n";
+    close FILE;
+    &util::rm ($file);
+}