Changeset 22986

Show
Ignore:
Timestamp:
29.09.2010 13:48:00 (9 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/inexport.pm

    r22567 r22986  
    659659 
    660660    foreach my $file (keys %{$manifest_lookup->{'index'}}) { 
    661         &plugin::read ($pluginfo, $importdir, $file, {}, {}, $processor, $maxdocs, 0, $gli); 
     661        my $block_hash = {}; 
     662        my $metadata = {}; 
     663        &plugin::file_block_read($pluginfo, $importdir, $file, $block_hash, $metadata, $gli); 
     664        &plugin::read ($pluginfo, $importdir, $file, $block_hash, $metadata, $processor, $maxdocs, 0, $gli); 
    662665    } 
    663666