Changeset 10215

Timestamp:

2005-07-06T15:20:33+12:00 (19 years ago)

Author:

kjdon

Message:

added Jeffrey's changes for parsing arguments - now all parsing is done from the arguments structure, not using parsarg

Location:

trunk/gsdl/bin/script

Files:

• buildcol.pl (modified) (7 diffs)
• import.pl (modified) (11 diffs)

trunk/gsdl/bin/script/buildcol.pl

@@ -45 +45 @@
 use gsprintf;
 use printusage;
+use parse2;
 
 my $mode_list =
@@ -79 +80 @@
     'desc' => "{buildcol.collectdir}",
     'type' => "string",
-    'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
+    # parsearg left "" as default
+    #'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
     'reqd' => "no",
         'hiddengli' => "yes" },
@@ -95 +97 @@
     'desc' => "{buildcol.faillog}",
     'type' => "string",
-    'deft' => &util::filename_cat("<collectdir>", "colname", "etc", "fail.log"),
+    # parsearg left "" as default
+    #'deft' => &util::filename_cat("<collectdir>", "colname", "etc", "fail.log"),
     'reqd' => "no",
     'modegli' => "4" },
@@ -122 +125 @@
     'type' => "enum",
     'list' => $mode_list,
-    'deft' => "all",
+    # parsearg left "" as default
+#   'deft' => "all",
     'reqd' => "no",
     'modegli' => "4" },
@@ -144 +148 @@
     'desc' => "{buildcol.verbosity}",
     'type' => "int",
-    'deft' => "2",
-    'reqd' => "no",
-    'modegli' => "4" } ];
+    # parsearg left "" as default
+    #'deft' => "2",
+    'reqd' => "no",
+    'modegli' => "4" },
+      { 'name' => "gli",
+    'desc' => "",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+      { 'name' => "xml",
+    'desc' => "",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" } ];
 
 my $options = { 'name' => "buildcol.pl",
@@ -168 +183 @@
     $no_strip_html, $no_text, $faillog, $gli);
 
-    # ***** 11-04-03 - John Thompson *****
     my $xml = 0;
-    # ************************************
-
-    # 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,
-             'archivedir/.*/', \$archivedir,
-             'cachedir/.*/', \$cachedir,  # UNDOCUMENTED
-             'builddir/.*/', \$builddir,
-             'maxdocs/^\-?\d+/', \$maxdocs,
-             'debug', \$debug,
-             'mode/^(all|compress_text|build_index|infodb)$/', \$mode,
-             'index/.*/', \$indexname,
-             'no_text', \$no_text,
-             'keepold', \$keepold,
-             'remove_empty_classifications', \$remove_empty_classifications,
-             'create_images', \$create_images,
-             'collectdir/.*/', \$collectdir,
-             'out/.*/STDERR', \$out,
-             'no_strip_html', \$no_strip_html,
-             'faillog/.*/', \$faillog,
-             'gli', \$gli,
-             q^xml^, \$xml)) {
+
+    my $hashParsingResult = {};
+    my $blnParseFailed = "false";
+    # general options available to all plugins
+    $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
+    # If there are more than one argument left after parsing, it mean user input too many arguments.
+    # Error occoured  will return 0
+    if($intArgLeftinAfterParsing != 1)
+    {
+    $blnParseFailed = "true"; 
+    }
+    if($blnParseFailed eq "true")
+    {
+    print "";
     &PrintUsage::print_txt_usage($options, "{buildcol.params}");
     die "\n";
+    }
+    foreach my $strVariable (keys %$hashParsingResult)
+    {
+    eval "\$$strVariable = \$hashParsingResult->{\"\$strVariable\"}";
     }
 
@@ -410 +418 @@
     $builder->set_strip_html(0);
     }
-
+    
     if ($mode =~ /^all$/i) {
     $builder->compress_text($textindex);

trunk/gsdl/bin/script/import.pl

@@ -49 +49 @@
 use gsprintf 'gsprintf';
 use printusage;
+use parse2;
 
 my $oidtype_list = 
@@ -85 +86 @@
     'desc' => "{import.collectdir}",
     'type' => "string",
-    'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
+    # parsearg left "" as default
+    #'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
+    'deft' => "",
     'reqd' => "no",
         'hiddengli' => "yes" },
@@ -96 +99 @@
     'desc' => "{import.faillog}",
     'type' => "string",
-    'deft' => &util::filename_cat("<collectdir>", "colname", "etc", "fail.log"),
+    # parsearg left "" as default
+    #'deft' => &util::filename_cat("<collectdir>", "colname", "etc", "fail.log"),
+    'deft' => "",
     'reqd' => "no",
         'modegli' => "4" },
@@ -129 +134 @@
     'type' => "int",
     'reqd' => "no",
+    # parsearg left "" as default
+    #'deft' => "-1",
     'range' => "1,",
     'modegli' => "1" },
@@ -135 +142 @@
     'type' => "enum",
     'list' => $oidtype_list,
-    'deft' => "hash",
+    # parsearg left "" as default
+    #'deft' => "hash",
     'reqd' => "no",
     'modegli' => "3" },
@@ -158 +166 @@
       { 'name' => "sortmeta",
     'desc' => "{import.sortmeta}",
-    'type' => "metadatum",
+#   'type' => "metadatum",
+    'type' => "string",
     'reqd' => "no",
     'modegli' => "3" },
@@ -182 +191 @@
     'desc' => "{import.verbosity}",
     'type' => "int",
-    'range' => "0,3",
-    'deft' => "2",
-    'reqd' => "no",
-    'modegli' => "4" }];
+    'range' => "0,",
+    # parsearg left "" as default
+    #'deft' => "2",
+    'reqd' => "no",
+    'modegli' => "4" },
+      { 'name' => "gli",
+    'desc' => "",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+      { 'name' => "xml",
+    'desc' => "",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" }];
 
 my $options = { 'name' => "import.pl",
@@ -203 +223 @@
     $archive_info, $processor, $out, $faillog, $collectdir, $gli);
 
-    # ***** 11-04-03 - John Thompson *****
     my $xml = 0;
-    # ************************************
+
     my $service = "import";
 
-    # 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,
-             'archivedir/.*/', \$archivedir, 
-             'keepold', \$keepold, 
-             'removeold', \$removeold, 
-             'saveas/^(GA|METS|DSpace)$/GA', \$saveas,
-             'version/.*/', \$version,
-             'gzip', \$gzip, 
-             'groupsize/\d+/1', \$groupsize, 
-             'OIDtype/^(hash|incremental|assigned|dirname)$/', \$OIDtype,
-             'sortmeta/.*/', \$sortmeta, 
-             'removeprefix/.*/', \$removeprefix,
-             'removesuffix/.*/', \$removesuffix,
-             'debug', \$debug,
-             'maxdocs/^\-?\d+/', \$maxdocs,
-             'collectdir/.*/', \$collectdir,
-             'out/.*/STDERR', \$out,
-             'statsfile/.*/STDERR', \$statsfile,
-             'faillog/.*/', \$faillog,
-             'gli', \$gli,
-             q^xml^, \$xml)) {
+    my $hashParsingResult = {};
+    my $blnParseFailed = "false";
+    # general options available to all plugins
+    $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
+    # If there are more than one argument left after parsing, it mean user input too many arguments.
+    # Error occoured  will return 0
+    if($intArgLeftinAfterParsing != 1)
+    {
+    $blnParseFailed = "true"; 
+    }
+    if($blnParseFailed eq "true")
+    {
     &PrintUsage::print_txt_usage($options, "{import.params}");
     die "\n";
+    }
+    foreach my $strVariable (keys %$hashParsingResult)
+    {
+    eval "\$$strVariable = \$hashParsingResult->{\"\$strVariable\"}";
     }
 
@@ -277 +287 @@
     (&gsprintf(STDERR, "{import.cannot_open_fail_log}\n", $faillog) && die);
 
+    
     my $faillogname = $faillog;
     $faillog = 'import::FAILLOG';
@@ -287 +298 @@
     $sortmeta = undef;
     }
-
     # dynamically load 'docsave' module so it can pick up on a collection
     # specific docsave.pm is specified.
@@ -382 +392 @@
         $gli = 1;
     }
+    
 
     # global plugin stuff