Changeset 22460

Timestamp:

2010-07-21T13:15:57+12:00 (14 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:

• bin/script/export.pl (modified) (1 diff)
• perllib/inexport.pm (modified) (4 diffs)

main/trunk/greenstone2/bin/script/export.pl

@@ -114 +114 @@
     [ 
       $saveas_argument,
-      { 'name' => "archivedir",
+      { 'name' => "exportdir",
     'desc' => "{export.archivedir}",
     'type' => "string",

main/trunk/greenstone2/perllib/inexport.pm

@@ -87 +87 @@
         &PrintUsage::print_xml_usage($options);
     print "\n";
-    return;
+    return bless $self, $class;
     }
 
@@ -98 +98 @@
     # -xml arg doesn't need a collection name
     # Or if the user specified -h, then we output the usage also
+
     if ($intArgLeftinAfterParsing != 1 || (@$argv && $argv->[0] =~ /^\-+h/))
     {
@@ -183 +184 @@
     my $debug      = $self->{'debug'};
     my $importdir  = $self->{'importdir'};
-    my $archivedir = $self->{'archivedir'};
+    my $archivedir = $self->{'archivedir'} || $self->{'exportdir'};
     my $out        = $self->{'out'};
 
@@ -330 +331 @@
 
     my $importdir   = $self->{'importdir'};
-    my $archivedir  = $self->{'archivedir'};
+    my $archivedir = $self->{'archivedir'} || $self->{'exportdir'};
 
     my $incremental = $self->{'incremental'};