Changeset 28703 for main/trunk

Timestamp:

2013-11-28T14:50:43+13:00 (10 years ago)

Author:

kjdon

Message:

can set the defaults now in the args structure, as we have default_argname to see if it was set by the user or not.

File:

• main/trunk/greenstone2/bin/script/import.pl (modified) (4 diffs)

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

@@ -103 +103 @@
     'type' => "enum",
     'list' => $saveas_list,
-    #'deft' => "GreenstoneXML", # if saveas is defined a default here, then any valid value provided in collect.cfg is ignored
+    'deft' => "GreenstoneXML", 
     'reqd' => "no",
     'modegli' => "3" };
@@ -139 +139 @@
     'type' => "string",
     'reqd' => "no",
+    'deft' => "archives",
         'hiddengli' => "yes" },
       @$inexport::directory_arguments,
@@ -284 +285 @@
     my $out        = $inexport->{'out'};
 
-    #groupsize can (currently) only be defined for import, not export, and 
-    # will be set to 1 if the user has not set it
-    if ((defined $inexport->{'groupsize'}) && ($inexport->{'groupsize'} == 1)) {
+    # check all options for default_optname - this will be set if the parsing
+    # code has just set the value based on the arg default. In this case,
+    # check in collect.cfg for the option
+    
+    # groupsize can only be defined for import, not export, and actually only
+    # applies to GreenstoneXML format.
+    if (defined $inexport->{'default_groupsize'}) {
     if (defined $collectcfg->{'groupsize'} && $collectcfg->{'groupsize'} =~ /\d+/) {
         $inexport->{'groupsize'} = $collectcfg->{'groupsize'};
     }
-    }
-
-    if (!defined $inexport->{'saveas'}) {
+
+    }
+    if (defined $inexport->{'default_saveas'}) {
     if (defined $collectcfg->{'saveas'} 
         && $collectcfg->{'saveas'} =~ /^(GreenstoneXML|GreenstoneMETS)$/) {
@@ -302 +307 @@
     
     my $sortmeta = $inexport->{'sortmeta'};
-    if (defined $collectcfg->{'sortmeta'} && (!defined $sortmeta || $sortmeta eq "")) {
+    if (defined $collectcfg->{'sortmeta'} && $sortmeta eq "") {
     $sortmeta = $collectcfg->{'sortmeta'};
     }