Changeset 22460


Ignore:
Timestamp:
2010-07-21T13:15:57+12:00 (12 years ago)
Author:
ak19
Message:

Reverted to using -exportdir with export.pl rather than 'merged' notion of both import.pl and export.pl using only -archivedir

Location:
main/trunk/greenstone2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/export.pl

    r22459 r22460  
    114114    [
    115115      $saveas_argument,
    116       { 'name' => "archivedir",
     116      { 'name' => "exportdir",
    117117    'desc' => "{export.archivedir}",
    118118    'type' => "string",
  • main/trunk/greenstone2/perllib/inexport.pm

    r22445 r22460  
    8787        &PrintUsage::print_xml_usage($options);
    8888    print "\n";
    89     return;
     89    return bless $self, $class;
    9090    }
    9191
     
    9898    # -xml arg doesn't need a collection name
    9999    # Or if the user specified -h, then we output the usage also
     100
    100101    if ($intArgLeftinAfterParsing != 1 || (@$argv && $argv->[0] =~ /^\-+h/))
    101102    {
     
    183184    my $debug      = $self->{'debug'};
    184185    my $importdir  = $self->{'importdir'};
    185     my $archivedir = $self->{'archivedir'};
     186    my $archivedir = $self->{'archivedir'} || $self->{'exportdir'};
    186187    my $out        = $self->{'out'};
    187188
     
    330331
    331332    my $importdir   = $self->{'importdir'};
    332     my $archivedir  = $self->{'archivedir'};
     333    my $archivedir = $self->{'archivedir'} || $self->{'exportdir'};
    333334
    334335    my $incremental = $self->{'incremental'};
Note: See TracChangeset for help on using the changeset viewer.