Changeset 22986

Timestamp:

2010-09-29T13:48:00+13:00 (14 years ago)

Author:

kjdon

Message:

need to do a file_block_read before a read when adding new docs through a manifest, in case we have been given a directory. Otherwise, eg for html file, get warnings about all the mages, or else they will be incorporated into the collection as individual docs.

File:

• main/trunk/greenstone2/perllib/inexport.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/inexport.pm

@@ -659 +659 @@
 
     foreach my $file (keys %{$manifest_lookup->{'index'}}) {
-        &plugin::read ($pluginfo, $importdir, $file, {}, {}, $processor, $maxdocs, 0, $gli);
+        my $block_hash = {};
+        my $metadata = {};
+        &plugin::file_block_read($pluginfo, $importdir, $file, $block_hash, $metadata, $gli);
+        &plugin::read ($pluginfo, $importdir, $file, $block_hash, $metadata, $processor, $maxdocs, 0, $gli);
     }