Changeset 9494 for trunk/gsdl/perllib/plugins/MARCPlug.pm

Timestamp:

2005-03-23T16:03:20+12:00 (19 years ago)

Author:

mdewsnip

Message:

A couple more fixes for the metadata_read stuff.

File:

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

trunk/gsdl/perllib/plugins/MARCPlug.pm

@@ -189 +189 @@
     my ($filename, $encoding, $language, $textref) = @_;
 
-    $self->{'readfile_encoding'} = $encoding;
+    $self->{'readfile_encoding'}->{$filename} = $encoding;
 
     my @marc_entries = ();
@@ -218 +218 @@
     my $self = shift (@_);
     my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
+
     my $outhandle = $self->{'outhandle'};
+    my $filename = &util::filename_cat($base_dir, $file);
 
     if (! defined($self->{'mm_file'}))
@@ -235 +237 @@
     $doc_obj->add_metadata($cursection, "FileFormat", "MARC");
     
-    my $filename = &util::filename_cat($base_dir, $file);
     my $marc_entries = $self->{'marc_entries'}->{$filename};
     my $marc = shift(@$marc_entries);
 
-    $self->extract_metadata ($marc, $metadata, $doc_obj, $cursection);
+    my $encoding = $self->{'readfile_encoding'}->{$filename};
+    $self->extract_metadata ($marc, $metadata, $encoding, $doc_obj, $cursection);
 
     # add spaces after the sub-field markers, for word boundaries
@@ -248 +250 @@
     $$textref =~ s/>/>/g;
 
-    my $encoding = $self->{'readfile_encoding'};
     $$textref = $self->to_utf8($encoding,$$textref);
 
@@ -296 +297 @@
 {
     my $self = shift (@_);
-    my ($marc, $metadata, $doc_obj, $section) = @_;
+    my ($marc, $metadata, $encoding, $doc_obj, $section) = @_;
     my $outhandle = $self->{'outhandle'};
-
-    my $encoding = $self->{'readfile_encoding'};
 
     my $metadata_mapping = $self->{'metadata_mapping'};