Changeset 16377

Timestamp:

2008-07-14T14:32:09+12:00 (15 years ago)

Author:

kjdon

Message:

added in global blocking pass, and now must pass a block hash to plugin::read

File:

• gsdl/trunk/bin/script/import.pl (modified) (2 diffs)

gsdl/trunk/bin/script/import.pl

@@ -572 +572 @@
     if ($manifest eq "") {
     # process the import directory
-    &plugin::read ($pluginfo, $importdir, "", {}, $processor, $maxdocs, 0, $gli);
+    my $block_hash = {};
+    my $metadata = {};
+    # gobal blocking pass may set up some metadata
+    &plugin::file_block_read($pluginfo, $importdir, "", $block_hash, $metadata, $gli);
+    &plugin::read ($pluginfo, $importdir, "", $block_hash, $metadata, $processor, $maxdocs, 0, $gli);
     }
     else
@@ -578 +582 @@
     # process any files marked for importing
     foreach my $file (keys %{$manifest_lookup->{'import'}}) {
-        &plugin::read ($pluginfo, $importdir, $file, {}, $processor, $maxdocs, 0, $gli);
+        &plugin::read ($pluginfo, $importdir, $file, {}, {}, $processor, $maxdocs, 0, $gli);
     }