Changeset 9493

Timestamp:

2005-03-23T15:46:13+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed some problems with SplitPlug and MARCPlug caused by the metadata_read code (only one file would be processed because the data wasn't stored by filename and would therefore be overwritten by following files).

Location:

trunk/gsdl/perllib/plugins

Files:

• MARCPlug.pm (modified) (3 diffs)
• SplitPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/MARCPlug.pm

@@ -191 +191 @@
     $self->{'readfile_encoding'} = $encoding;
 
-    @marc_entries = ();
+    my @marc_entries = ();
 
     if (!-r $filename)
@@ -208 +208 @@
     }
 
-    $self->{'marc_entries'} = \@marc_entries;
+    $self->{'marc_entries'}->{$filename} = \@marc_entries;
 }
 
@@ -235 +235 @@
     $doc_obj->add_metadata($cursection, "FileFormat", "MARC");
     
-    my $marc_entries = $self->{'marc_entries'};
+    my $filename = &util::filename_cat($base_dir, $file);
+    my $marc_entries = $self->{'marc_entries'}->{$filename};
     my $marc = shift(@$marc_entries);
 

trunk/gsdl/perllib/plugins/SplitPlug.pm

@@ -169 +169 @@
         if $self->{'verbosity'};
     
-    $self->{'split_segments'} = \@segments;
+    $self->{'split_segments'}->{$file} = \@segments;
     $split_matched = scalar(@segments);
     }
@@ -208 +208 @@
     $self->{'textcat_store'}->{$file} = undef;
 
-    my $segments = $self->{'split_segments'};
-
-    $self->{'split_segments'} = undef;
+    my $segments = $self->{'split_segments'}->{$file};
+    $self->{'split_segments'}->{$file} = undef;
 
     # Process each segment in turn