Changeset 16386

Timestamp:

2008-07-14T14:43:50+12:00 (16 years ago)

Author:

kjdon

Message:

global block pass: now uses process_exp instead of block_exp. during metadata_read the file is added to the block list in so its not processed again in read

Location:

gsdl/trunk/perllib/plugins

Files:

• MetadataCSVPlugin.pm (modified) (4 diffs)
• MetadataXMLPlugin.pm (modified) (4 diffs)

gsdl/trunk/perllib/plugins/MetadataCSVPlugin.pm

@@ -37 +37 @@
 
 
-my $arguments =
-    [ { 'name' => "block_exp",
-    'desc' => "{BasePlugin.block_exp}",
+my $arguments = [
+      { 'name' => "process_exp",
+    'desc' => "{BasePlugin.process_exp}",
     'type' => "regexp",
     'reqd' => "no",
-    'deft' => &get_default_block_exp() } ];
+    'deft' => &get_default_process_exp() }
+
+];
 
 
@@ -67 +69 @@
 
 
-# Not used, just here to prevent a warning
 sub get_default_process_exp
 {
@@ -73 +74 @@
 }
 
-
-# Used by BasePlugin read to block this file
-sub get_default_block_exp
-{
-    return q^(?i)\.csv$^;
-}
-
-
 sub metadata_read
 {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
 
     # Read metadata from CSV files
@@ -93 +86 @@
     print STDERR "\n<Processing n='$file' p='MetadataCSVPlugin'>\n" if ($gli);
     print STDERR "MetadataCSVPlugin: processing $file\n" if ($self->{'verbosity'}) > 1;
+
+    # add the file to the block list so that it won't be processed in read, as we will do all we can with it here
+    $block_hash->{'file_blocks'}->{$filename} = 1;
 
     # Read the CSV file to get the metadata

gsdl/trunk/perllib/plugins/MetadataXMLPlugin.pm

@@ -101 +101 @@
 
 my $arguments = [
-      { 'name' => "block_exp",
-    'desc' => "{BasePlugin.block_exp}",
+      { 'name' => "process_exp",
+    'desc' => "{BasePlugin.process_exp}",
     'type' => "regexp",
     'reqd' => "no",
-    'deft' => &get_default_block_exp() }
+    'deft' => &get_default_process_exp() }
+
 ];
 
@@ -162 +163 @@
 }
 
-# We don't want any other plugins to see metadata.xml files
-# block exp are currently only used in the read bit
-sub get_default_block_exp
-{
-    return q^metadata\.xml$^;
-}
 
 sub metadata_read
 {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata,
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata,
 $processor, $maxdocs, $gli) = @_;
 
@@ -182 +177 @@
     print STDERR "\n<Processing n='$file' p='MetadataXMLPlugin'>\n" if ($gli);
     print STDERR "MetadataXMLPlugin: processing $file\n" if ($self->{'verbosity'})> 1;
-
+    # add the file to the block list so that it won't be processed in read, as we will do all we can with it here
+    $block_hash->{'file_blocks'}->{$filename} = 1;
     $self->{'metadataref'} = $extrametadata;
     $self->{'metakeysref'} = $extrametakeys;
@@ -197 +193 @@
     return -1; #error
     }
+
     return 1;