Changeset 10230

Timestamp:

2005-07-08T11:08:25+12:00 (19 years ago)

Author:

kjdon

Message:

now uses jeffrey's new parse2 parsing. also now accepts xxx.pm as plugin/classifier name

Location:

trunk/gsdl/bin/script

Files:

• classinfo.pl (modified) (5 diffs)
• pluginfo.pl (modified) (3 diffs)

trunk/gsdl/bin/script/classinfo.pl

@@ -27 +27 @@
 ###########################################################################
 
+use strict;
+no strict 'subs'; # allow barewords (eg STDERR) as function arguments
 
 BEGIN {
@@ -38 +40 @@
 use classify;
 use util;
-use parsargv;
 use gsprintf;
 use printusage;
 
+use parse2;
 
 my $arguments =
@@ -47 +49 @@
     'desc' => "{classinfo.collect}",
     'type' => "string",
+    'deft' => "",
     'reqd' => "no" },
       { 'name' => "xml",
@@ -70 +73 @@
 }
 
-
-#  sub print_usage {
-#      print STDERR "\n";
-#      print STDERR "classinfo.pl: Prints information about a classifier.\n\n";
-#      print STDERR " usage: $0 [options] classifier\n\n";
-#      print STDERR " options:\n";
-#      print STDERR "  -collect collection-name  Giving a collection name will make classinfo.pl\n";
-#      print STDERR "                            look in collect/collection-name/perllib/classify\n";
-#      print STDERR "                            first. If the classifier is not found there it will\n";
-#      print STDERR "                            look in the general perllib/classify directory.\n\n";
-#      print STDERR "  -xml                      Produces the information in an xml form, without\n";
-#      print STDERR "                            'pretty' comments but with much more detail.\n\n";
-#      print STDERR "  -language language-code   Language to display classifer options in (eg. 'en_US'\n";
-#      print STDERR "                            specifies American English). Requires translations\n";
-#      print STDERR "                            of the option descriptions to exist in the\n";
-#      print STDERR "                            perllib/strings_language-code.rb file.\n";
-#  }
-
-
 sub main {
     my $collect = "";
     my $xml = 0;
     my $listall = 0;
+    my $language;
 
-    # Parse command line
-    if (!parsargv::parse(\@ARGV,
-             q^collect/.*/^, \$collect,
-             q^xml^, \$xml,
-             q^listall^, \$listall,
-             q^language/.*/^, \$language))
+    my $hashParsingResult = {};
+    my $blnParseFailed = "false";
+    # general options available to all plugins
+    my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
+    # If there are more than one argument left after parsing, it mean user input too many arguments.
+    # Error occoured  will return 0
+    if($intArgLeftinAfterParsing > 1)
     {
-    &PrintUsage::print_txt_usage($options, "{classinfo.params}", 1);
+    &PrintUsage::print_txt_usage($options, "{classinfo.params}");
     die "\n";
     }
 
+    foreach my $strVariable (keys %$hashParsingResult)
+    {
+    eval "\$$strVariable = \$hashParsingResult->{\"\$strVariable\"}";
+    }
     # If $language has been specified, load the appropriate resource bundle
     # (Otherwise, the default resource bundle will be loaded automatically)
@@ -113 +103 @@
     # Get classifier
     my $classifier = shift (@ARGV);
+    $classifier =~ s/\.pm$//; # allow xxx.pm as the argument
+    
     if (($listall == 0) && (!defined $classifier || $classifier eq "")) {
     &gsprintf(STDERR, "{classinfo.no_classifier_name}\n\n");

trunk/gsdl/bin/script/pluginfo.pl

@@ -41 +41 @@
 use plugin;
 use util;
-use parsargv;
 use gsprintf;
 use printusage;
 
+use parse2;
 
 my $arguments =
@@ -78 +78 @@
     my $xml = 0;
     my $listall = 0;
-
+    
     my ($language, $encoding);
 
-    if (!parsargv::parse(\@ARGV,
-             q^collect/.*/^, \$collect,
-             q^xml^, \$xml,
-             q^listall^, \$listall,
-             q^language/.*/^, \$language))
+    my $hashParsingResult = {};
+    my $blnParseFailed = "false";
+    # general options available to all plugins
+    my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
+    # If there are more than one argument left after parsing, it mean user input too many arguments.
+    # Error occoured  will return 0
+    if($intArgLeftinAfterParsing > 1)
     {
-    PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
+    &PrintUsage::print_txt_usage($options, "{pluginfo.params}");
     die "\n";
+    }
+
+    foreach my $strVariable (keys %$hashParsingResult)
+    {
+    eval "\$$strVariable = \$hashParsingResult->{\"\$strVariable\"}";
     }
 
@@ -114 +121 @@
 
     my $plugin = shift (@ARGV);
+    $plugin =~ s/\.pm$//; # allow xxxPlug.pm as the argument
+    
     if (($listall == 0) && (!defined $plugin || $plugin eq "")) {
     gsprintf(STDERR, "{pluginfo.no_plugin_name}\n\n");