Changeset 25332 for main/trunk/greenstone2/perllib

Timestamp:

2012-04-03T12:27:45+12:00 (12 years ago)

Author:

kjdon

Message:

if we block OAI files, then they won't get processed by OAIPlugin, so removing the block exp

File:

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

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

@@ -148 +148 @@
 }
 
-
-# This plugin blocks *.oai files, so that they can be processed by OAIPlugin
-# even if OAIPlugin comes later in the pipeline than EmbeddedMetadataPlugin.
-sub get_default_block_exp()
-{
-    return q^(?i)\.(oai)$^;
-}
-
 # plugins that rely on more than process_exp (eg XML plugins) can override this method
 sub can_process_this_file {
@@ -230 +222 @@
             if (defined $value && $value =~ /[a-z0-9]+/i) {
                 my $field = "ex.$group.$tag";
-        
+                
                 my $encoding = $self->{'input_encoding'};
                 if($encoding eq "auto")
@@ -335 +327 @@
 
     if (defined &extrametautil::getmetadata($extrametadata, $file)) {
-    print STDERR "\n****  Need to merge new metadata with existing stored metadata: file = $file\n" if $verbosity > 2;
+    print STDERR "\n****  EmbeddedMetadataPlugin: Need to merge new metadata with existing stored metadata: file = $file\n" if $verbosity > 3;
 
     my $file_metadata_table = &extrametautil::getmetadata($extrametadata, $file);