Changeset 31189 for main

Timestamp:

2016-12-09T21:28:50+13:00 (7 years ago)

Author:

ak19

Message:

Corrections and cleanups ahead of major commit to do with the new oaiinfo db code.

File:

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

main/trunk/greenstone2/perllib/inexport.pm

@@ -484 +484 @@
     # Since this wasted my morning, let's at least warn a user that manifest
     # files now *only* work if keepold is set [jmt12]
-    if ($self->{'manifest'} && !$self->{'keepold'})
+    if ($self->{'manifest'} && (!$keepold || !$incremental))
     {
       print STDERR "Warning: -manifest flag should not be specified without also setting -keepold or -incremental\n";
@@ -812 +812 @@
       # need to check this file exists before trying to read it - in the past
       # it wasn't possible to have a manifest unless keepold was also set so
-      # you were pretty much guarenteed arcinfo existed
+      # you were pretty much guaranteed arcinfo existed
       # [jmt12]
       # @todo &FileUtils::fileExists($arcinfo_src_filename) [jmt12]
@@ -874 +874 @@
         }
       }
-    }
+    } # end if (manifest ne "")
     else {
     # if incremental, we read through the import folder to see whats changed.
@@ -933 +933 @@
                 
         }       
-    }
-    }
+    } # end if incremental/only_add mode
+    # else no manifest AND not incremental
+    } # end if else block of manifest ne "" else eq ""
 
     # Check for existence of the file that's to contain earliestDateStamp in archivesdir