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

trunk/gsdl/bin/script/pluginfo.pl

@@ -85 +85 @@
 
     my $hashParsingResult = {};
-    my $blnParseFailed = "false";
     # general options available to all plugins
     my $unparsed_args = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
-
+    # parse returns -1 if an error occurred
+    if ($unparsed_args == -1) {
+    
+    PrintUsage::print_txt_usage($options, "{pluginfo.params}");
+    die "\n";
+    }
+    
     foreach my $strVariable (keys %$hashParsingResult)
     {
@@ -121 +126 @@
     }
 
-    # If there are more than one argument left after parsing, it mean user input too many arguments.
-    # Error occoured  will return 0
-    if( $unparsed_args > 1 or (@ARGV && $ARGV[0] =~ /^\-+h/) )
+    # If there is not exactly 1 argument left (plugin name), then the arguments were wrong
+    # Or if the user specified -h, then we output the usage also
+    if( $unparsed_args != 1 || (@ARGV && $ARGV[0] =~ /^\-+h/) )
     {
-    PrintUsage::print_txt_usage($options, "{pluginfo.params}");
-    die "\n";
-    }
-
+    PrintUsage::print_txt_usage($options, "{pluginfo.params}");  
+        die "\n";
+    }
+    
     my $plugin = shift (@ARGV);
     if (defined $plugin) {