Changeset 10218 for trunk/gsdl/perllib/classify/BasClas.pm

Timestamp:

2005-07-06T15:27:45+12:00 (19 years ago)

Author:

kjdon

Message:

Jeffrey's new parsing modifications, committed approx 6 July, 15.16

File:

• trunk/gsdl/perllib/classify/BasClas.pm (modified) (3 diffs)

trunk/gsdl/perllib/classify/BasClas.pm

@@ -56 +56 @@
 use gsprintf;
 use printusage;
-
+use parse2;
 
 my $arguments = 
@@ -67 +67 @@
     'type' => "string",
     'deft' => "STDERR" },
-#      { 'name' => "verbosity",
-#   'desc' => "{BasClas.verbosity}",
+      { 'name' => "verbosity",
+    'desc' => "{BasClas.verbosity}",
 #   'type' => "enum",
-#   'deft' => "2",
-#   'reqd' => "no" } ];
+    'type' => "int",
+    'deft' => "2",
+    'reqd' => "no" },
 #      { 'name' => "ignore_namespace",
 #   'desc' => "{BasClas.ignore_namespace}",
@@ -214 +215 @@
 
 sub new {
-    my $class = shift (@_);
-    my $name = shift (@_);
-
+    my ($class) = shift (@_);
+    my ($classifierslist,$args,,$hashArgOptLists) = @_;
+    push(@$classifierslist, $class);
+    my $classifier_name = (defined $classifierslist->[0]) ? $classifierslist->[0] : $class;
+    print STDERR "new $classifier_name\n";
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+
+    # Manually set $self parameters.
     my $self = {};
-
     $self->{'outhandle'} = STDERR;
     $self->{'idnum'} = -1;
-    
-    $self->{'option_list'} = [ $options ];
-    my $gsdlinfo;
-
-    # general options available to all classifiers
-    if (!parsargv::parse(\@_,
-             q^builddir/.*/^, \$self->{'builddir'},
-             q^outhandle/.*/STDERR^, \$self->{'outhandle'},
-             q^verbosity/\d/2^, \$self->{'verbosity'},
-             q^ignore_namespace^, \$self->{'ignore_namespace'},
-             q^gsdlinfo^, \$gsdlinfo,
-             "allow_extra_options")) {
-
-    &gsprintf(STDERR, "\n{BasClas.bad_general_option}\n", $name);
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-
-    if ($gsdlinfo) {
-    # created from classinfo.pl - set this so subclasses don't need to 
-    # parse the arguments
-    $self->{'info_only'} = 1;
-    }
-    return bless $self, $class;
+    $self->{'option_list'} = $hashArgOptLists->{"OptList"};
+    $self->{"info_only"} = 0;
+
+    # Check if gsdlinfo is in the argument list or not.  
+    foreach $strArg (@{$args})
+    {
+    if($strArg eq "gsdlinfo")
+    {
+        $self->{"info_only"} = 1;
+        last;
+    }
+    }
+
+    # If gsdlinfo is not in the argument list, process the argument normally.
+    if($self->{"info_only"} == 0)
+    {
+    my $blnParseFailed = "false";
+    # general options available to all plugins
+    if(!parse2::parse($args,$hashArgOptLists->{"ArgList"},$self))
+    {
+        $blnParseFailed = "true"; 
+    }
+    
+    # If the parsing wasn't successful, then print out the text usage of this classifier. 
+    my $classTempClass = bless $self, $class;
+    if($blnParseFailed eq "true")
+    {
+        &gsprintf(STDERR, "\n{BasClas.bad_general_option}\n", $classifier_name);
+        $classTempClass->print_txt_usage("");  # Use default resource bundle
+        die "\n";
+    }
+    else
+    {
+        delete $self->{"info_only"};
+        return $classTempClass;
+    }
+    }
+
+    # If gsdlinfo is in the argument list, do not perform any parsing.
+    else
+    {   
+    delete $self->{"info_only"};
+    return bless $self, $class;
+    }
 }