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

trunk/gsdl/bin/script/explode_metadata_database.pl

@@ -98 +98 @@
 
     my $hashParsingResult = {};
-    my $blnParseFailed = "false";
     # parse the options
     my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
+
+    # If parse returns -1 then something has gone wrong
+    if ($intArgLeftinAfterParsing == -1)
+    {
+    &PrintUsage::print_txt_usage($options, "{explode.params}");
+    die "\n";
+    }
 
     foreach my $strVariable (keys %$hashParsingResult)
@@ -119 +125 @@
     }
 
-    # There should one arg left after parsing
-    if($intArgLeftinAfterParsing > 1)
+    # There should one arg left after parsing (the filename)
+    # Or the user may have specified -h, in which case we output the usage
+    if($intArgLeftinAfterParsing != 1 || (@ARGV && $ARGV[0] =~ /^\-+h/))
     {
     &PrintUsage::print_txt_usage($options, "{explode.params}");