Changeset 1431

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

Location:

trunk/gsdl

Files:

• bin/script/build (modified) (8 diffs)
• bin/script/buildcol.pl (modified) (1 diff)
• bin/script/filecopy.pl (modified) (1 diff)
• bin/script/import.pl (modified) (1 diff)
• perllib/plugin.pm (modified) (2 diffs)
• perllib/plugins/HTMLPlug.pm (modified) (1 diff)
• perllib/util.pm (modified) (1 diff)

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);
+}

trunk/gsdl/bin/script/buildcol.pl

@@ -91 +91 @@
     my $close_out = 0;
     if ($out !~ /^(STDERR|STDOUT)$/i) {
-    open (OUT, ">>$out") || die "Couldn't open output file $out\n";
+    open (OUT, ">$out") || die "Couldn't open output file $out\n";
     $out = "buildcol::OUT";
     $close_out = 1;

trunk/gsdl/bin/script/filecopy.pl

@@ -151 +151 @@
     my $close_out = 0;
     if ($out !~ /^(STDERR|STDOUT)$/i) {
-    open (OUT, ">>$out") || die "Couldn't open output file $out\n";
-    $out = "MAIN::OUT";
+    open (OUT, ">$out") || die "Couldn't open output file $out\n";
+    $out = OUT;
     $close_out = 1;
     }

trunk/gsdl/bin/script/import.pl

@@ -94 +94 @@
     my $close_out = 0;
     if ($out !~ /^(STDERR|STDOUT)$/i) {
-    open (OUT, ">>$out") || die "Couldn't open output file $out\n";
+    open (OUT, ">$out") || die "Couldn't open output file $out\n";
     $out = 'import::OUT';
     $close_out = 1;

trunk/gsdl/perllib/plugin.pm

@@ -29 +29 @@
 
 sub load_plugins {
-    my ($plugin_list, $verbosity, $outhandle) = @_;
+    my ($plugin_list) = shift @_;
+    ($verbosity, $outhandle) = @_; # globals
     my @plugin_objects = ();
 
     $verbosity = 2 unless defined $verbosity;
+    $outhandle = STDERR unless defined $outhandle;
 
     foreach $pluginoptions (@$plugin_list) {
@@ -86 +88 @@
     }
     
-    if (defined $processor->{'verbosity'} && $processor->{'verbosity'} >= 2) {
-    print STDERR "WARNING - no plugin could process " . 
+    if ($verbosity >= 2) {
+    print $outhandle "WARNING - no plugin could process " . 
         &util::filename_cat($base_dir,$file) . "\n";
     }

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -119 +119 @@
     my $self = shift (@_);
     my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj) = @_;
-    my $outhandle = $self->{'outhandle'}
-
-    print $outhandle "HTMLPlug: processing $file\n" 
+    my $outhandle = $self->{'outhandle'};
+
+    print $outhandle "HTMLPlug: processing $file\n"
     if $self->{'verbosity'} > 1;
 

trunk/gsdl/perllib/util.pm

@@ -555 +555 @@
     # are defined
     $ENV{'GSDLCOLLECTION'} = $collection unless defined $ENV{'GSDLCOLLECTION'};
-    $ENV{'GSDLCOLLECTDIR'} = "$ENV{'GSDLHOME'}/collect/$collection";
+    $ENV{'GSDLCOLLECTDIR'} = &filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
 
     # make sure this collection exists