Changeset 9494 for trunk/gsdl

Timestamp:

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

Author:

mdewsnip

Message:

A couple more fixes for the metadata_read stuff.

Location:

trunk/gsdl/perllib/plugins

Files:

• MARCPlug.pm (modified) (5 diffs)
• ProCitePlug.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'};

trunk/gsdl/perllib/plugins/ProCitePlug.pm

@@ -91 +91 @@
 
 
-my %workform_definitions;
 my %crazy_workform_mapping =
     ( "A", "Book, Long Form",
@@ -120 +119 @@
     my ($filename, $encoding, $language, $textref) = @_;
 
-    # Reset the workform definitions from previous files
-    %workform_definitions = ();
+    # Store the workform definitions for this file
+    my %workform_definitions = ();
 
     # Read the contents of the file into $textref
@@ -151 +150 @@
     $workform_definitions{$workform_name} = \@workform_values;
     }
+
+    $self->{'workform_definitions'}->{$filename} = \%workform_definitions;
 }
 
@@ -160 +161 @@
 
     my $outhandle = $self->{'outhandle'};
+    my $filename = &util::filename_cat($base_dir, $file);
 
     # Report that we're processing the file
@@ -180 +182 @@
 
     # Check we know about the workform of this record
+    my %workform_definitions = %{$self->{'workform_definitions'}->{$filename}};
     if (!$workform_definitions{$workform_indicator}) {
     print STDERR "Unknown workform!\n";