Changeset 29370

Timestamp:

2014-10-16T11:23:45+13:00 (10 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.

File:

• main/trunk/greenstone2/perllib/inexport.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/inexport.pm

@@ -542 +542 @@
         $manifest_filename = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, $manifest_filename);
     }
-
         $self->{'manifest'} = &FileUtils::sanitizePath($self->{'manifest'});
     #$self->{'manifest'} =~ s/[\\\/]+/\//g;
@@ -704 +703 @@
     
     # global blocking pass may set up some metadata
+    # does this set up metadata?????
     # - when we have a newer manifest file we don't do this -unless- the
     #   collection configuration indicates this collection contains complex
@@ -839 +839 @@
       #   we can explicitly process metadata files other than metadata.xml)
       # [jmt12]
-      if ($self->{'manifest_version'} < 1 && (!defined $collectcfg->{'complexmeta'} || $collectcfg->{'complexmeta'} ne 'true'))
+      if ($self->{'manifest_version'} == 1 && (!defined $collectcfg->{'complexmeta'} || $collectcfg->{'complexmeta'} ne 'true'))
       {
         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
   # $block_hash (so obeying process_exp and block_exp) [jmt12]
-  elsif ($manifest eq '' || $self->{'manifest_version'} < 1)
+  elsif ($manifest eq '' || $self->{'manifest_version'} == 1)
   {
     &plugin::read ($pluginfo, $importdir, '', $block_hash, $metadata, $processor, $maxdocs, 0, $gli);