Changeset 29370

Show
Ignore:
Timestamp:
16.10.2014 11:23:45 (5 years ago)
Author:
kjdon
Message:

can't have a manifest version less than 1, so making the test == 1. It should have been <= 1 anyway.

Files:
1 modified

Legend:

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

    r29096 r29370  
    542542        $manifest_filename = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, $manifest_filename); 
    543543    } 
    544  
    545544        $self->{'manifest'} = &FileUtils::sanitizePath($self->{'manifest'}); 
    546545    #$self->{'manifest'} =~ s/[\\\/]+/\//g; 
     
    704703     
    705704    # global blocking pass may set up some metadata 
     705    # does this set up metadata????? 
    706706    # - when we have a newer manifest file we don't do this -unless- the 
    707707    #   collection configuration indicates this collection contains complex 
     
    839839      #   we can explicitly process metadata files other than metadata.xml) 
    840840      # [jmt12] 
    841       if ($self->{'manifest_version'} < 1 && (!defined $collectcfg->{'complexmeta'} || $collectcfg->{'complexmeta'} ne 'true')) 
     841      if ($self->{'manifest_version'} == 1 && (!defined $collectcfg->{'complexmeta'} || $collectcfg->{'complexmeta'} ne 'true')) 
    842842      { 
    843843        my @all_files_to_import = (keys %{$block_hash->{'reindex_files'}}, keys %{$block_hash->{'new_files'}}); 
     
    10171017  # control what is imported, while non-manifest imports use a regular 
    10181018  # $block_hash (so obeying process_exp and block_exp) [jmt12] 
    1019   elsif ($manifest eq '' || $self->{'manifest_version'} < 1) 
     1019  elsif ($manifest eq '' || $self->{'manifest_version'} == 1) 
    10201020  { 
    10211021    &plugin::read ($pluginfo, $importdir, '', $block_hash, $metadata, $processor, $maxdocs, 0, $gli);