Changeset 31189


Ignore:
Timestamp:
12/09/16 21:28:50 (4 years ago)
Author:
ak19
Message:

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

File:
1 edited

Legend:

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

    r30517 r31189  
    484484    # Since this wasted my morning, let's at least warn a user that manifest
    485485    # files now *only* work if keepold is set [jmt12]
    486     if ($self->{'manifest'} && !$self->{'keepold'})
     486    if ($self->{'manifest'} && (!$keepold || !$incremental))
    487487    {
    488488      print STDERR "Warning: -manifest flag should not be specified without also setting -keepold or -incremental\n";
     
    812812      # need to check this file exists before trying to read it - in the past
    813813      # it wasn't possible to have a manifest unless keepold was also set so
    814       # you were pretty much guarenteed arcinfo existed
     814      # you were pretty much guaranteed arcinfo existed
    815815      # [jmt12]
    816816      # @todo &FileUtils::fileExists($arcinfo_src_filename) [jmt12]
     
    874874        }
    875875      }
    876     }
     876    } # end if (manifest ne "")
    877877    else {
    878878    # if incremental, we read through the import folder to see whats changed.
     
    933933               
    934934        }       
    935     }
    936     }
     935    } # end if incremental/only_add mode
     936    # else no manifest AND not incremental
     937    } # end if else block of manifest ne "" else eq ""
    937938
    938939    # Check for existence of the file that's to contain earliestDateStamp in archivesdir
Note: See TracChangeset for help on using the changeset viewer.