Changeset 16381

Timestamp:

2008-07-14T14:37:01+12:00 (16 years ago)

Author:

kjdon

Message:

global block pass: added in plugin:file_block_read, which is the global blocking pass. read and metadata_read modified to take an exta argument, block_hash which contains blocking info - this is really only usesd by DirectoryPlugin which does the actual blocking

File:

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

gsdl/trunk/perllib/plugin.pm

@@ -195 +195 @@
 }
 
+sub file_block_read {
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $gli) = @_;
+
+
+    $gli = 0 unless defined $gli;
+
+    my $rv = 0;
+    my $glifile = $file;
+    
+    $glifile =~ s/^[\/\\]+//; # file sometimes starts with a / so get rid of it
+    
+    # Announce to GLI that we are handling a file
+    print STDERR "<File n='$glifile'>\n" if $gli;
+    
+    # the .kill file is a handy (if not very elegant) way of aborting 
+    # an import.pl or buildcol.pl process
+    if (-e &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, ".kill")) {
+    gsprintf($outhandle, "{plugin.kill_file}\n");
+    die "\n";
+    }
+    
+    foreach my $plugobj (@$pluginfo) {
+
+        $rv = $plugobj->file_block_read($pluginfo, $base_dir, $file, $block_hash, $metadata, $gli); 
+    #last if (defined $rv && $rv==1); # stop this file once we have found something to 'process' it
+    }
+    
+}
+
 
 sub metadata_read {
-    my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux) = @_;
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux) = @_;
 
     $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/;
@@ -228 +257 @@
     foreach my $plugobj (@$pluginfo) {
 
-    $rv = $plugobj->metadata_read($pluginfo, $base_dir, $file, 
+    $rv = $plugobj->metadata_read($pluginfo, $base_dir, $file, $block_hash,
                  $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux);
 
@@ -246 +275 @@
 
 sub read {
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli, $aux) = @_;
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli, $aux) = @_;
 
     $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/;
@@ -266 +295 @@
     die "\n";
     }
-
+    
     my $had_error = 0;
     # pass this file by each of the plugins in turn until one
@@ -279 +308 @@
 
         $rv = $plugobj->read($pluginfo, $base_dir, $file, 
-                 $metadata, $processor, $maxdocs, $total_count, $gli, $aux);
+                 $block_hash, $metadata, $processor, $maxdocs, 
+                 $total_count, $gli, $aux);
 
     if (defined $rv) {