Changeset 12615

Timestamp:

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

Author:

kjdon

Message:

changed slightly the checking of how many args we have left after parsing. we need to allow listall and describeall without a plugin name

Location:

trunk/gsdl/bin/script

Files:

• downloadinfo.pl (modified) (3 diffs)
• plugoutinfo.pl (modified) (2 diffs)

trunk/gsdl/bin/script/downloadinfo.pl

@@ -88 +88 @@
     # parse returns -1 on error
     if ($unparsed_args == -1) {
-    PrintUsage::print_txt_usage($options, "{pluginfo.params}");
+    PrintUsage::print_txt_usage($options, "{downloadinfo.params}");
     die "\n";
     }
@@ -127 +127 @@
     # Or if the user specified -h, then we output the usage also
 
-    if( $unparsed_args != 1 || (@ARGV && $ARGV[0] =~ /^\-+h/) )
+    if((@ARGV && $ARGV[0] =~ /^\-+h/) )
     {
     PrintUsage::print_txt_usage($options, "{downloadinfo.params}");
@@ -133 +133 @@
     }
     
+    # If there is not exactly 1 argument left (download name), then the arguments were wrong (apart from if we had listall or describeall set)
+    if ($listall == 0 && $describeall ==0 && $unparsed_args == 0) {
+    gsprintf(STDERR, "{downloadinfo.no_download_name}\n\n");
+    PrintUsage::print_txt_usage($options, "{downloadinfo.params}", 1);
+    die "\n";
+    }
+
+    # we had some arguments that we weren't expecting
+    if ($unparsed_args > 1) {
+    pop(@ARGV); # assume that the last arg is the download name
+    gsprintf(STDERR, "{common.invalid_options}\n\n", join (',', @ARGV));
+    PrintUsage::print_txt_usage($options, "{downloadinfo.params}", 1);
+    die "\n";
+    }
     my $download_name = shift (@ARGV);
     if (defined $download_name) {
     $download_name =~ s/\.pm$//; # allow xxx.pm as the argument
-    }
-    if (($listall == 0 && $describeall ==0) && (!defined $download_name || $download_name eq "")) {
-    gsprintf(STDERR, "{downloadinfo.no_download_name}\n\n");
-    PrintUsage::print_txt_usage($options, "{downloadinfo.params}", 1);
-    die "\n";
     }
 

trunk/gsdl/bin/script/plugoutinfo.pl

@@ -130 +130 @@
     # If there is not exactly 1 argument left (plugout 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/) )
+    if(@ARGV && $ARGV[0] =~ /^\-+h/ )
     {
     PrintUsage::print_txt_usage($options, "{plugoutinfo.params}");  
@@ -136 +136 @@
     }
 
+    # If there is not exactly 1 argument left (plugout name), then the arguments were wrong (apart from if we had listall or describeall set)
+    if ($listall == 0 && $describeall ==0 && $unparsed_args == 0) {
+    gsprintf(STDERR, "{plugoutinfo.no_plugout_name}\n\n");
+    PrintUsage::print_txt_usage($options, "{plugoutinfo.params}", 1);
+    die "\n";
+    }
+
+    # we had some arguments that we weren't expecting
+    if ($unparsed_args > 1) {
+    pop(@ARGV); # assume that the last arg is the plugout name
+    gsprintf(STDERR, "{common.invalid_options}\n\n", join (',', @ARGV));
+    PrintUsage::print_txt_usage($options, "{plugoutinfo.params}", 1);
+    die "\n";
+    }
+
     my $plugout = shift (@ARGV);
     if (defined $plugout) {
     $plugout =~ s/\.pm$//; # allow xxxPlugout.pm as the argument
-    }
-    if (($listall == 0 && $describeall ==0) && (!defined $plugout || $plugout eq "")) {
-    gsprintf(STDERR, "{plugoutinfo.no_plugout_name}\n\n");
-    PrintUsage::print_txt_usage($options, "{plugoutinfo.params}", 1);
-    die "\n";
     }