Changeset 19493 for gsdl/trunk/perllib/plugins/MetadataXMLPlugin.pm

Timestamp:

2009-05-18T10:57:05+12:00 (15 years ago)

Author:

davidb

Message:

Introduction of new extrametafile to track which metadata.xml file a piece of metadata came from

File:

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

gsdl/trunk/perllib/plugins/MetadataXMLPlugin.pm

@@ -167 +167 @@
 {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata,
-$processor, $maxdocs, $gli) = @_;
+    my ($pluginfo, $base_dir, $file, $block_hash, 
+    $extrametakeys, $extrametadata,$extrametafile,
+    $processor, $maxdocs, $gli) = @_;
 
     my $filename = &util::filename_cat($base_dir, $file);
@@ -174 +175 @@
         return undef;
     }
+
+    $self->{'metadata-file'} = $file;
+    $self->{'metadata-filename'} = $filename;
 
     my $outhandle = $self->{'outhandle'};
@@ -182 +186 @@
     $block_hash->{'file_blocks'}->{$filename} = 1;
     $self->{'metadataref'} = $extrametadata;
+    $self->{'metafileref'} = $extrametafile;
     $self->{'metakeysref'} = $extrametakeys;
     
@@ -236 +241 @@
         my $file_metadata = $self->{'metadataref'}->{$target};
         my $saved_metadata = $self->{'saved_metadata'};
+
         if (!defined $file_metadata) {
         $self->{'metadataref'}->{$target} = $saved_metadata;
@@ -245 +251 @@
         &metadatautil::combine_metadata_structures($file_metadata,$saved_metadata);
         }
+
+        
+        # now record which metadata.xml file it came from
+
+        my $file = $self->{'metadata-file'};
+        my $filename = $self->{'metadata-filename'};
+
+        if (!defined $self->{'metafileref'}->{$target}) {
+        $self->{'metafileref'}->{$target} = {};
+        }
+
+        $self->{'metafileref'}->{$target}->{$file} = $filename
     }
     }