Changeset 16697

Timestamp:

2008-08-11T14:04:23+12:00 (16 years ago)

Author:

kjdon

Message:

if marc mapping file cannot be located, print a warning about can't extract metadata but continue to process the file - get the record in the text so at least get something in the collection

Location:

gsdl/trunk/perllib/plugins

Files:

• MARCPlugin.pm (modified) (5 diffs)
• MARCXMLPlugin.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/MARCPlugin.pm

@@ -128 +128 @@
     my $msg = "MARCPlugin ERROR: Can't locate mapping file \"" .
         $self->{'metadata_mapping_file'} . "\".\n " .
-        "    No marc files can be processed.\n";
+        "    No metadata will be extracted from MARC files.\n";
 
     print $outhandle $msg;
@@ -190 +190 @@
     my ($filename, $encoding, $language, $textref) = @_;
 
+    my $outhandle = $self->{'outhandle'};
+    
+    if (! defined($self->{'metadata_mapping'}))
+    {
+    # print a warning
+    print $outhandle "MARCPlugin: no metadata file! Can't extract metadata from $filename\n";
+    }
+
     $self->{'readfile_encoding'}->{$filename} = $encoding;
 
@@ -195 +203 @@
     if (!-r $filename)
     {
-    my $outhandle = $self->{'outhandle'};
     print $outhandle "Read permission denied for $filename\n" if $self->{'verbosity'};
     return;
@@ -243 +250 @@
     my $filename = &util::filename_cat($base_dir, $file);
 
-    if (! defined($self->{'metadata_mapping'}))
-    {
-    print $outhandle "MARCPlugin: no metadata file! Can't process $file\n";
-    return undef;
-    }
-
     my $cursection = $doc_obj->get_top_section();
 
@@ -259 +260 @@
     my $encoding = $self->{'readfile_encoding'}->{$filename};
 
-    if ($self->{'type'} ne "ascii" ){   
-        $self->extract_metadata ($marc, $metadata, $encoding, $doc_obj, $cursection);
-    }
-    else{
-    $self->extract_ascii_metadata ($$textref,$metadata,$doc_obj, $cursection);
+    if (defined ($self->{'metadata_mapping'}) ) {
+    if ($self->{'type'} ne "ascii" ){   
+        $self->extract_metadata ($marc, $metadata, $encoding, $doc_obj, $cursection);
+    }
+    else{
+        $self->extract_ascii_metadata ($$textref,$metadata,$doc_obj, $cursection);
+    }
     }
 

gsdl/trunk/perllib/plugins/MARCXMLPlugin.pm

@@ -111 +111 @@
     my $msg = "MARCXMLPlugin ERROR: Can't locate mapping file \"" .
         $self->{'metadata_mapping_file'} . "\".\n " .
-        "    No marc files can be processed.\n";
+        "    No metadata will be extracted from MARCXML files.\n";
 
     print $outhandle $msg;
@@ -206 +206 @@
 
     my $outhandle = $self->{'outhandle'};
-    print $outhandle "Record $self->{'record_count'} - MARCXMLPlugin: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
+    print $outhandle "Record $self->{'record_count'}\n" if $self->{'verbosity'} > 1; 
 
         $self->{'record_count'}++;
@@ -322 +322 @@
 
     ## map the xmlmarc to gsdl metadata
-    if ($element eq "datafield" and defined $self->{'doc_obj'} and defined $self->{'marc_mapping'}){
+    if ($element eq "datafield" and defined $self->{'doc_obj'} and defined $self->{'marc_mapping'} and defined $self->{'metadata_mapping'}){
     my $metadata_mapping = $self->{'metadata_mapping'};
     my $marc_mapping = $self->{'marc_mapping'};