Changeset 31700 for main/trunk

Timestamp:

2017-05-25T13:21:02+12:00 (7 years ago)

Author:

kjdon

Message:

export.pl has -saveas_options so you can pass in plugout options. added it to import.pl too.

Location:

main/trunk/greenstone2

Files:

• bin/script/import.pl (modified) (2 diffs)
• perllib/inexport.pm (modified) (1 diff)

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

@@ -112 +112 @@
     [ 
       $saveas_argument,
+      { 'name' => "saveas_options",
+    'desc' => "{import.saveas_options}",
+    'type' => "string",
+    'reqd' => "no" },
     { 'name' => "sortmeta",
     'desc' => "{import.sortmeta}",
@@ -320 +324 @@
     }
     }
+    if (!defined $inexport->{'saveas_options'} || $inexport->{'saveas_options'} eq "") {
+    if (defined $collectcfg->{'saveas_options'} ){
+        $inexport->{'saveas_options'} = $collectcfg->{'saveas_options'};
+    }
+    }
     
     my $sortmeta = $inexport->{'sortmeta'};

main/trunk/greenstone2/perllib/inexport.pm

@@ -671 +671 @@
     my $plugout_name = $plugout->[0];
 
-    if ($inexport_mode eq "export" && defined $saveas_options) {
+    if (defined $saveas_options) {
     my @user_plugout_options = split(" ", $saveas_options);
     push @$plugout, @user_plugout_options;