Changeset 22852 for main/trunk

Timestamp:

2010-09-06T11:47:57+12:00 (14 years ago)

Author:

kjdon

Message:

now prints errors to outhandle, failhandle and gli xml instead of just to STDERR

File:

• main/trunk/greenstone2/perllib/plugins/MetadataCSVPlugin.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/plugins/MetadataCSVPlugin.pm

@@ -30 +30 @@
 use BasePlugin;
 use strict;
-
+no strict 'refs';
 use multiread;
 
@@ -108 +108 @@
     print STDERR "\n<Processing n='$file' p='MetadataCSVPlugin'>\n" if ($gli);
     print STDERR "MetadataCSVPlugin: processing $file\n" if ($self->{'verbosity'}) > 1;
+
+    my $outhandle = $self->{'outhandle'};
+    my $failhandle = $self->{'failhandle'};
 
     # add the file to the block list so that it won't be processed in read, as we will do all we can with it here
@@ -136 +139 @@
 
     if (!$found_filename_field) {
-    print STDERR "MetadataCSVPlugin Error: No Filename field in CSV file: $filename\n";
+    $self->print_error($outhandle, $failhandle, $gli, $filename, "No Filename field in CSV file");
     return -1; # error
     }
@@ -171 +174 @@
         # The line must be formatted incorrectly
         else {
-        print STDERR "MetadataCSVPlugin Error: Badly formatted CSV line: $csv_line.\n";
+        $self->print_error($outhandle, $failhandle, $gli, $filename, "Badly formatted CSV line: $csv_line");
         last;
         }
@@ -181 +184 @@
     my $csv_line_filename_array = $csv_line_metadata{"Filename"};
     if (!defined $csv_line_filename_array) {
-        print STDERR "MetadataCSVPlugin Error: No Filename metadata in CSV line: $orig_csv_line\n";
+        $self->print_error($outhandle, $failhandle, $gli, $filename, "No Filename metadata in CSV line: $orig_csv_line");
         next;
     }
@@ -202 +205 @@
 }
 
-
+sub print_error
+{
+
+    my $self = shift(@_);
+    my ($outhandle, $failhandle, $gli, $file, $error) = @_;
+
+    print $outhandle "MetadataCSVPlugin Error: $file: $error\n";
+    print $failhandle "MetadataCSVPlugin Error: $file: $error\n";
+    print STDERR "<ProcessingError n='$file' r='$error'/>\n" if ($gli);
+}
 1;