Changeset 17300


Ignore:
Timestamp:
2008-09-17T10:28:33+12:00 (16 years ago)
Author:
kjdon
Message:

removed the metadata argument from metadata_read as its not used and just confuses things when implementing this

Location:
gsdl/trunk/perllib
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/perllib/plugin.pm

    r17032 r17300  
    227227
    228228sub metadata_read {
    229     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux) = @_;
     229    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux) = @_;
    230230
    231231    $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/;
    … …  
    259259
    260260    $rv = $plugobj->metadata_read($pluginfo, $base_dir, $file, $block_hash,
    261                  $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux);
     261                 $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux);
    262262
    263263    if (defined $rv) {

  • gsdl/trunk/perllib/plugins/BasePlugin.pm

    r17212 r17300  
    866866sub metadata_read {
    867867    my $self = shift (@_);
    868     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
     868    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
    869869   
    870870    # can we process this file??

  • gsdl/trunk/perllib/plugins/DSpacePlugin.pm

    r16392 r17300  
    240240sub metadata_read {
    241241    my $self = shift (@_);
    242     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
     242    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
    243243
    244244    my $only_first_doc = $self->{'only_first_doc'};

  • gsdl/trunk/perllib/plugins/LOMPlugin.pm

    r16392 r17300  
    118118sub metadata_read {
    119119    my $self = shift (@_);
    120     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
     120    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
    121121
    122122    my $outhandle = $self->{'outhandle'};

  • gsdl/trunk/perllib/plugins/MetadataCSVPlugin.pm

    r16386 r17300  
    7777{
    7878    my $self = shift (@_);
    79     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
     79    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
    8080
    8181    # Read metadata from CSV files

  • gsdl/trunk/perllib/plugins/MetadataXMLPlugin.pm

    r16851 r17300  
    167167{
    168168    my $self = shift (@_);
    169     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata,
     169    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata,
    170170$processor, $maxdocs, $gli) = @_;
    171171

  • gsdl/trunk/perllib/plugins/OAIPlugin.pm

    r17290 r17300  
    171171    my $self = shift (@_); 
    172172
    173     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
     173    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
    174174
    175175    # can we process this file??

  • gsdl/trunk/perllib/plugins/SplitTextFile.pm

    r17033 r17300  
    118118sub metadata_read {
    119119    my $self = shift (@_); 
    120     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
     120    my ($pluginfo, $base_dir, $file, $block_hash, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
    121121
    122122    # returns 1 if matches process_exp, and has done blocking in the meantime
    123123    my $matched = $self->SUPER::metadata_read($pluginfo, $base_dir, $file,
    124124                          $block_hash,
    125                           $metadata, $extrametakeys,
     125                          $extrametakeys,
    126126                          $extrametadata, $processor,
    127127                          $maxdocs, $gli);
Note: See TracChangeset for help on using the changeset viewer.