greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16377

Show
Ignore:
Timestamp:
2008-07-14 14:32:09 (4 months ago)
Author:
kjdon
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gsdl/trunk/bin/script/import.pl

    r16255 r16377  
    572572    if ($manifest eq "") { 
    573573        # process the import directory 
    574         &plugin::read ($pluginfo, $importdir, "", {}, $processor, $maxdocs, 0, $gli); 
     574        my $block_hash = {}; 
     575        my $metadata = {}; 
     576        # gobal blocking pass may set up some metadata 
     577        &plugin::file_block_read($pluginfo, $importdir, "", $block_hash, $metadata, $gli); 
     578        &plugin::read ($pluginfo, $importdir, "", $block_hash, $metadata, $processor, $maxdocs, 0, $gli); 
    575579    } 
    576580    else 
    …… 
    578582        # process any files marked for importing 
    579583        foreach my $file (keys %{$manifest_lookup->{'import'}}) { 
    580             &plugin::read ($pluginfo, $importdir, $file, {}, $processor, $maxdocs, 0, $gli); 
     584            &plugin::read ($pluginfo, $importdir, $file, {}, {}, $processor, $maxdocs, 0, $gli); 
    581585        } 
    582586