Changeset 12545 for trunk/gsdl/bin/script/exportcol.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/exportcol.pl (modified) (2 diffs)

trunk/gsdl/bin/script/exportcol.pl

@@ -97 +97 @@
 
     my $hashParsingResult = {};
-    my $blnParseFailed = "false";
+
     # parse options
     my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
-    # don't care how many args are left - can have multiple collection names
+
+    # If parse returns -1 then something has gone wrong
+    if ($intArgLeftinAfterParsing == -1)
+    {
+    &PrintUsage::print_txt_usage($options, "{exportcol.params}");
+    die "\n";
+    }
+    
     foreach my $strVariable (keys %$hashParsingResult)
     {
@@ -122 +129 @@
     }
     
+    # 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, "{exportcol.params}");
+    die "\n";
+    }
+
     my @coll_list = @ARGV;
-    
-    if (not @coll_list) { # empty list
-    &PrintUsage::print_txt_usage($options, "{exportcol.params}");
-    exit(1);
-    }
 
     my $close_out = 0;