Changeset 2785 for trunk/gsdl/perllib/plugins/ConvertToPlug.pm

Timestamp:

2001-10-09T17:21:29+13:00 (23 years ago)

Author:

sjboddie

Message:

The build process now creates a summary of how many files were included,
which were rejected, etc. A link to a page containing this summary is
provided from the final page of the collector (once the collection is built
successfully) and from the default "about this collection" text for
collections built by the collector.

Also did a little bit of tidying in a couple of places

File:

• trunk/gsdl/perllib/plugins/ConvertToPlug.pm (modified) (5 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -48 +48 @@
 #    @ISA = ('BasPlug'); #, 'HTMLPlug', 'TEXTPlug');
 }
-
-# use strict;  # this breaks 'print $outhandle ' error msgs.
 
 sub print_usage {
@@ -146 +144 @@
     my $outhandle = $self->{'outhandle'};
     my $convert_to = $self->{'convert_to'};
+    my $failhandle = $self->{'failhandle'};
 
     # softlink to collection tmp dir
@@ -184 +183 @@
     if ($output_type eq "fail") {
     print $outhandle "Could not convert $tailname$suffix to $convert_to format\n";
-    if ($self->{'faillogname'} ne "" && -s "$errlog") {
-        open(SAVELOG, ">>$self->{'faillogname'}");
+    print $failhandle "$tailname$suffix: " . ref($self) . " failed to convert to $convert_to\n";
+    $self->{'num_not_processed'} ++;
+    if (-s "$errlog") {
         open(ERRLOG, "$errlog");
-        print SAVELOG "$tailname$suffix (converting to $convert_to) failed:\n";
         while (<ERRLOG>) {
-        print SAVELOG "$_";
+        print $outhandle "$_";
         }
+        print $outhandle "\n";
         close ERRLOG;
-        print SAVELOG "\n";
-        close SAVELOG;
     }
     &util::rm("$errlog") if (-e "$errlog");
@@ -236 +234 @@
 
     my $filename = &util::filename_cat($base_dir, $file);
-    return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/;
+    if ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
+    $self->{'num_blocked'} ++;
+    return 0;
+    }
     if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
         return undef;
@@ -299 +300 @@
     $self->cleanup_tmp_area();
 
+    $self->{'num_processed'} ++;
 
     return 1;