Changeset 12613

Timestamp:

2006-08-30T15:49:44+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:

• classinfo.pl (modified) (2 diffs)
• pluginfo.pl (modified) (1 diff)

trunk/gsdl/bin/script/classinfo.pl

@@ -105 +105 @@
     
     # If there is not exactly 1 argument left (classifier name), then the arguments were wrong
-    # Or if the user specified -h, then we output the usage also
-    if( $intArgLeftinAfterParsing != 1 || (@ARGV && $ARGV[0] =~ /^\-+h/) )
+    # If the user specified -h, then we output the usage also
+    if((@ARGV && $ARGV[0] =~ /^\-+h/) )
     {
     PrintUsage::print_txt_usage($options, "{classinfo.params}");  
         die "\n";
+    }
+
+    # If there is not exactly 1 argument left (plugin name), then the arguments were wrong (apart from if we had listall or describeall set)
+    if ($listall == 0 && $describeall ==0 && $intArgLeftinAfterParsing == 0) {
+    gsprintf(STDERR, "{pluginfo.no_plugin_name}\n\n");
+    PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
+    die "\n";
+    }
+    
+    # we had some arguments that we weren't expecting
+    if ($intArgLeftinAfterParsing > 1) {
+    pop(@ARGV); # assume that the last arg is the plugin name
+    gsprintf(STDERR, "{common.invalid_options}\n\n", join (',', @ARGV));
+    PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
+    die "\n";
     }
 
@@ -116 +131 @@
     if (defined $classifier) {
     $classifier =~ s/\.pm$//; # allow xxx.pm as the argument
-    }
-    if (($listall == 0 && $describeall == 0) && (!defined $classifier || $classifier eq "")) {
-    &gsprintf(STDERR, "{classinfo.no_classifier_name}\n\n");
-    &PrintUsage::print_txt_usage($options, "{classinfo.params}", 1);
-    die "\n";
     }
 

trunk/gsdl/bin/script/pluginfo.pl

@@ -127 +127 @@
 
     # 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/) )
+    # If the user specified -h, then we output the usage also
+    if((@ARGV && $ARGV[0] =~ /^\-+h/) )
     {
     PrintUsage::print_txt_usage($options, "{pluginfo.params}");  
         die "\n";
     }
-    
+
+    # If there is not exactly 1 argument left (plugin 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, "{pluginfo.no_plugin_name}\n\n");
+    PrintUsage::print_txt_usage($options, "{pluginfo.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 plugin name
+    gsprintf(STDERR, "{common.invalid_options}\n\n", join (',', @ARGV));
+    PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
+    die "\n";
+    }
+    
     my $plugin = shift (@ARGV);
     if (defined $plugin) {
     $plugin =~ s/\.pm$//; # allow xxxPlug.pm as the argument
-    }
-    if (($listall == 0 && $describeall ==0) && (!defined $plugin || $plugin eq "")) {
-    gsprintf(STDERR, "{pluginfo.no_plugin_name}\n\n");
-    PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
-    die "\n";
     }