Changeset 29370 for main/trunk/greenstone2
- Timestamp:
- 2014-10-16T11:23:45+13:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/inexport.pm
r29096 r29370 542 542 $manifest_filename = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, $manifest_filename); 543 543 } 544 545 544 $self->{'manifest'} = &FileUtils::sanitizePath($self->{'manifest'}); 546 545 #$self->{'manifest'} =~ s/[\\\/]+/\//g; … … 704 703 705 704 # global blocking pass may set up some metadata 705 # does this set up metadata????? 706 706 # - when we have a newer manifest file we don't do this -unless- the 707 707 # collection configuration indicates this collection contains complex … … 839 839 # we can explicitly process metadata files other than metadata.xml) 840 840 # [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')) 842 842 { 843 843 my @all_files_to_import = (keys %{$block_hash->{'reindex_files'}}, keys %{$block_hash->{'new_files'}}); … … 1017 1017 # control what is imported, while non-manifest imports use a regular 1018 1018 # $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) 1020 1020 { 1021 1021 &plugin::read ($pluginfo, $importdir, '', $block_hash, $metadata, $processor, $maxdocs, 0, $gli);
Note:
See TracChangeset
for help on using the changeset viewer.