Changeset 25333

Timestamp:

2012-04-03T12:29:15+12:00 (12 years ago)

Author:

kjdon

Message:

added some output messages. make sure we keep previous metadata - there may be metadata for a file from a previous plugin, not just from OAIPlugin

File:

• main/trunk/greenstone2/perllib/plugins/OAIPlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/OAIPlugin.pm

@@ -200 +200 @@
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
     return undef unless $self->can_process_this_file_for_metadata($filename_full_path);
+
+    print STDERR "\n<Processing n='$file' p='OAIPlugin'>\n" if ($gli);
+    print STDERR "OAIPlugin: processing $file\n" if ($self->{'verbosity'}) > 1;
     
     if (!$self->parse_file($filename_full_path, $file, $gli)) {
@@ -206 +209 @@
     }
 
+    my $verbosity = $self->{'verbosity'};
     my $new_metadata = $self->{'saved_metadata'};
     $self->{'saved_metadata'} = undef;
@@ -263 +267 @@
     $filename_for_metadata = &util::filepath_to_url_format($filename_for_metadata);
     $filename_for_metadata = &util::filename_to_regex($filename_for_metadata);
-    
-    &extrametautil::setmetadata($extrametadata, $filename_for_metadata, $new_metadata);
-    &extrametautil::addmetakey($extrametakeys, $filename_for_metadata);
+
+    # Check that we haven't already got some metadata
+    if (defined &extrametautil::getmetadata($extrametadata, $filename_for_metadata)) {
+    print STDERR "\n****  OAIPlugin: Need to merge new metadata with existing stored metadata: file = $filename_for_metadata\n" if $verbosity > 3;
+
+    my $file_metadata_table = &extrametautil::getmetadata($extrametadata, $filename_for_metadata);
+
+    foreach my $metaname (keys %{$new_metadata}) {
+        # will create new entry if one does not already exist
+        push(@{$file_metadata_table->{$metaname}}, @{$new_metadata->{$metaname}});      
+    }
+
+    } else {
+    &extrametautil::setmetadata($extrametadata, $filename_for_metadata, $new_metadata);
+    &extrametautil::addmetakey($extrametakeys, $filename_for_metadata);
+    }
+
     if ($srcdoc_exists) {   
     if (!defined &extrametautil::getmetafile($extrametafile, $filename_for_metadata)) {