Changeset 28077 for main

Timestamp:

2013-08-16T18:59:26+12:00 (11 years ago)

Author:

ak19

Message:

Fix noticed when doing diffcol. When the import option saveas was set to GreenstoneMETS in collect.cfg, this was ignored, although passing it as a cmdline option to import.pl worked. The reason was that the saveas option had a default assigned, unlike OIDtype, and if it already had a value, then any value in collect.cfg was never consulted. Now the METS tutorial collection should work from the cmdline.

Location:

main/trunk/greenstone2

Files:

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

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

@@ -118 +118 @@
     'type' => "enum",
     'list' => $saveas_list,
-    'deft' => "GreenstoneXML",
+    #'deft' => "GreenstoneXML", # if saveas is defined a default here, then any valid value provided in collect.cfg is ignored
     'reqd' => "no",
     'modegli' => "3" };

main/trunk/greenstone2/perllib/inexport.pm

@@ -309 +309 @@
     if (defined $collectcfg->{'groupsize'} && $collectcfg->{'groupsize'} =~ /\d+/) {
         $self->{'groupsize'} = $collectcfg->{'groupsize'};
+    }
+    }
+    
+    if (!defined $self->{'saveas'}
+    || ($self->{'saveas'} !~ /^(GreenstoneXML|GreenstoneMETS)$/ )) {
+    # saveas was either not defined on the command-line, or it was not one of the recognized values
+    if (defined $collectcfg->{'saveas'} 
+        && $collectcfg->{'saveas'} =~ /^(GreenstoneXML|GreenstoneMETS)$/) {
+        $self->{'saveas'} = $collectcfg->{'saveas'};
+    } else {
+        $self->{'saveas'} = "GreenstoneXML"; # the default
     }
     }