Changeset 12545 for trunk/gsdl/bin/script/export.pl

Timestamp:

2006-08-24T16:17:35+12:00 (18 years ago)

Author:

kjdon

Message:

changed parse2::parse so that it returns -1 on error, 0 on success, or if allow_extra_options is specified, then on success returns the number of args left over. allowed the use of -h to print the usage for all scripts

File:

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

trunk/gsdl/bin/script/export.pl

@@ -235 +235 @@
 
     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    
+    
+    # If parse returns -1 then something has gone wrong
+    if ($intArgLeftinAfterParsing == -1)
+    {
+    &PrintUsage::print_txt_usage($options, "{export.params}");
+    die "\n";
+    }
+
     foreach my $strVariable (keys %$hashParsingResult)
     {
@@ -280 +286 @@
     }
 
-    if (scalar(@ARGV) == 0) {
+    # can have more than one collection name,  
+    # if the first extra option is -h, then output the help
+    if (scalar(@ARGV) == 0 || (@ARGV && $ARGV[0] =~ /^\-+h/)) {
     &PrintUsage::print_txt_usage($options, "{export.params}");
     die "\n";