Changeset 10340

Timestamp:

2005-07-28T14:10:21+12:00 (19 years ago)

Author:

kjdon

Message:

use new parse2 arg parsing, added 'use strict'

File:

• trunk/gsdl/bin/script/export.pl (modified) (11 diffs)

trunk/gsdl/bin/script/export.pl

@@ -41 +41 @@
 }
 
+use strict;
+no strict 'refs'; # allow filehandles to be variables and vice versa
+no strict 'subs'; # allow barewords (eg STDERR) as function arguments
+
 use arcinfo;
 use colcfg;
@@ -46 +50 @@
 use docprint;
 use util;
-use parsargv;
 use FileHandle;
 use gsprintf;
 use printusage;
+use parse2;
+
 
 my $oidtype_list = 
@@ -84 +89 @@
 
 my $arguments = 
-    [ { 'name' => "exportdir",
+    [ 
+      $saveas_argument,
+      { 'name' => "saveas_version",
+    'desc' => "{export.saveas_version}",
+    'type' => "string",
+    'reqd' => "no" },
+      { 'name' => "exportdir",
     'desc' => "{export.exportdir}",
+    'type' => "string",
+    'reqd' => "no",
+        'hiddengli' => "yes" },
+      { 'name' => "importdir",
+    'desc' => "{import.importdir}",
     'type' => "string",
     'reqd' => "no",
@@ -107 +123 @@
     'desc' => "{export.faillog}",
     'type' => "string",
-    'deft' => &util::filename_cat("<collectdir>", "colname", "etc", "fail.log"),
+    'deft' => "",
     'reqd' => "no",
         'modegli' => "4" },
-      { 'name' => "importdir",
-    'desc' => "{import.importdir}",
-    'type' => "string",
-    'reqd' => "no",
-        'hiddengli' => "yes" },
       { 'name' => "keepold",
     'desc' => "{export.keepold}",
@@ -120 +131 @@
     'reqd' => "no",
         'hiddengli' => "yes" },
+      { 'name' => "removeold",
+    'desc' => "{export.removeold}",
+    'type' => "flag",
+    'reqd' => "no",
+    'modegli' => "3" },
       { 'name' => "language",
     'desc' => "{scripts.language}",
@@ -137 +153 @@
     'reqd' => "no",
         'hiddengli' => "yes" },
-      { 'name' => "removeold",
-    'desc' => "{export.removeold}",
-    'type' => "flag",
-    'reqd' => "no",
-    'modegli' => "3" },
-      $saveas_argument,
       { 'name' => "statsfile",
     'desc' => "{export.statsfile}",
@@ -155 +165 @@
     'deft' => "2",
     'reqd' => "no",
-    'modegli' => "4" } ];
+    'modegli' => "4" },
+      { 'name' => "gli",
+    'desc' => "",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+      { 'name' => "xml",
+    'desc' => "{scripts.xml}",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" }
+      ];
 
 my $options = { 'name' => "export.pl",
@@ -174 +195 @@
 
 sub main {
-    my ($verbosity, $importdir, $archivedir, $keepold, $listall,
-    $removeold, $saveas, $version,
-    $gzip, $groupsize, $OIDtype, $debug, 
-    $maxdocs, $collection, $configfilename, 
-    $pluginfo, $sortmeta, 
-    $export_info_filename, $statsfile,
-    $export_info, $processor, $out, $faillog, $collectdir, $gli);
-
-    # ***** 11-04-03 - John Thompson *****
+    # params
+    my ($language, $verbosity, $importdir, $exportdir, $keepold, $listall,
+    $removeold, $saveas, $saveas_version, $debug, 
+    $maxdocs, $statsfile, $out, $faillog, $collectdir, $gli);
     my $xml = 0;
-    # ************************************
+    
+    # other vars
+    my ($configfilename, $collection, $export_info_filename, $export_info, $processor, $pluginfo);
     my $service = "export";
 
-    # note that no defaults are passed for most options as they're set
-    # later (after we check the collect.cfg file)
-    if (!parsargv::parse(\@ARGV,
-             'language/.*/', \$language,
-             'verbosity/\d+/', \$verbosity,
-             'importdir/.*/', \$importdir,
-             'exportdir/.*/', \$exportdir,
-             'listall', \$listall, 
-             'keepold', \$keepold, 
-             'removeold', \$removeold, 
-             'saveas/^(DSpace|METS|GA)$/METS', \$saveas,
-             'version/.*/', \$version,
-             'debug', \$debug,
-             'maxdocs/^\-?\d+/', \$maxdocs,
-             'collectdir/.*/', \$collectdir,
-             'out/.*/STDERR', \$out,
-             'statsfile/.*/STDERR', \$statsfile,
-             'faillog/.*/', \$faillog,
-             'gli', \$gli,
-             q^xml^, \$xml)) {
-    &PrintUsage::print_txt_usage($options, "{export.params}");
-    die "\n";
-    }
-
-    $gzip = undef;
-    $groupsize = 1;
-    $OIDtype = undef;
-    $sortmeta = undef;
+    my $hashParsingResult = {};
+    my $blnParseFailed = "false";
+    # general options available to all plugins
+    my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
+    # can have more than one collection name, so don't check num args left    
+    foreach my $strVariable (keys %$hashParsingResult)
+    {
+    eval "\$$strVariable = \$hashParsingResult->{\"\$strVariable\"}";
+    }
+
+    
+    # these are options used by other things - we just set default values
+    # undef means will be set from config file if there
+    my $gzip = undef; 
+    my $groupsize = 1;
+    my $OIDtype = undef;
+    my $sortmeta = undef;
 
     my $explicit_exportdir = (defined $exportdir) ? 1 : 0;
@@ -239 +246 @@
     }
 
+    if (scalar(@ARGV) == 0) {
+    &PrintUsage::print_txt_usage($options, "{export.params}");
+    die "\n";
+    }
+
     if ($gli) { # the gli wants strings to be in UTF-8
     &gsprintf::output_strings_in_UTF8; 
@@ -418 +430 @@
         $processor->set_OIDtype ($OIDtype);
         $processor->set_saveas ($saveas);
-        $processor->set_saveas_version ($version);
+        $processor->set_saveas_version ($saveas_version);
         } else {
         $processor = new docprint ();
@@ -476 +488 @@
     $removeold = 0 if ($explicit_exportdir);
 
-    }
+    } # while processing ARGV
     
     &gsprintf($out, "\n");