Changeset 28704 for main/trunk/greenstone2/bin

Timestamp:

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

Author:

kjdon

Message:

got rid of all plugout specific options - these are now all specified in -saveas_options, which gets passed directly to the plugout. added GreenstoneXML format to list of saveas options. added an option include_auxiliary_database_files - if set, export will generate the archivesinf databases, otherwise you'll only get the document files. args can set their defaults in the data structure - we now use default_argname variable to test whether value was set by the user or parse function. can put saveas_options into collect.cfg

File:

• main/trunk/greenstone2/bin/script/export.pl (modified) (5 diffs)

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

@@ -74 +74 @@
 # what format to export as
 my $saveas_list = 
-    [ { 'name' => "GreenstoneMETS",
+    [ { 'name' => "GreenstoneXML",
+    'desc' => "{export.saveas.GreenstoneXML}"},
+      { 'name' => "GreenstoneMETS",
         'desc' => "{export.saveas.GreenstoneMETS}"},
       { 'name' => "FedoraMETS",
@@ -110 +112 @@
     'type' => "string",
     'reqd' => "no" },
+      { 'name' => "include_auxiliary_database_files",
+    'desc' => "{export.include_auxiliary_database_files}",
+    'type' => "flag",
+    'reqd' => "no" },
       { 'name' => "exportdir",
     'desc' => "{export.exportdir}",
     'type' => "string",
     'reqd' => "no",
+    'deft' => "export",
         'hiddengli' => "yes" },
       @$inexport::directory_arguments,
@@ -121 +128 @@
     'reqd' => "no",
         'hiddengli' => "yes" },
-      { 'name' => "xslt_txt",
-    'desc' => "{METSPlugout.xslt_txt}",
-    'type' => "string",
-    'reqd' => "no",
-        'hiddengli' => "no" },
-      { 'name' => "xslt_mets",
-    'desc' => "{METSPlugout.xslt_mets}",
-    'type' => "string",
-    'reqd' => "no",
-        'hiddengli' => "no" },
-      { 'name' => "fedora_namespace",
-    'desc' => "{FedoraMETSPlugout.fedora_namespace} (-saveas FedoraMETS)",
-    'type' => "string",
-    'deft' => "greenstone",
-    'reqd' => "no",
-        'hiddengli' => "no" },
-      { 'name' => "mapping_file",
-    'desc' => "{MARCXMLPlugout.mapping_file} (-saveas MARCXML)",
-    'type' => "string",
-    'reqd' => "no",
-        'hiddengli' => "no" },
-      { 'name' => "group_marc",
-    'desc' => "{MARCXMLPlugout.group} (-saveas MARCXML)",
-    'type' => "flag",
-    'reqd' => "no",
-        'hiddengli' => "no" },
-      { 'name' => "metadata_prefix",
-    'desc' => "{DSpacePlugout.metadata_prefix} (-saveas DSpace)}",
-    'type' => "string",
-    'reqd' => "no",
-        'hiddengli' => "no" },
       { 'name' => "listall",
     'desc' => "{export.listall}",
@@ -193 +169 @@
     my ($inexport, $collectcfg) = @_;
 
-    if (!defined $inexport->{'saveas'}) {
+    if (defined $inexport->{'default_saveas'}) {
+    # we had set the value from the arg default, not from the user
     if (defined $collectcfg->{'saveas'} 
-        && $collectcfg->{'saveas'} =~ /^(GreenstoneMETS|FedoraMETS|MARCXML|DSPace)$/) {
+        && $collectcfg->{'saveas'} =~ /^(GreenstoneXML|GreenstoneMETS|FedoraMETS|MARCXML|DSPace)$/) {
         $inexport->{'saveas'} = $collectcfg->{'saveas'};
     } else {
@@ -202 +179 @@
     }
 
-    if (!defined $inexport->{'saveas_options'}) {
+    if (!defined $inexport->{'saveas_options'} || $inexport->{'saveas_options'} eq "") {
     if (defined $collectcfg->{'saveas_options'} ){
-        $inexport->{'saveas'} = $collectcfg->{'saveas_options'};
+        $inexport->{'saveas_options'} = $collectcfg->{'saveas_options'};
     }
     }