Changeset 10229

Timestamp:

2005-07-08T09:56:37+12:00 (19 years ago)

Author:

kjdon

Message:

fixed up some stuff for printing args (pluginfo.pl, classinfo.pl)

Location:

trunk/gsdl/perllib

Files:

• classify/BasClas.pm (modified) (5 diffs)
• plugins/BasPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/classify/BasClas.pm

@@ -53 +53 @@
 # 28/11/03 Commented out verbosity argument - John Thompson
 
-use parsargv;
+#use parsargv;
 use gsprintf;
 use printusage;
 use parse2;
+
+# suppress the annoying "subroutine redefined" warning that various
+# classifiers cause under perl 5.6
+$SIG{__WARN__} = sub {warn($_[0]) unless ($_[0] =~ /Subroutine\s+\S+\sredefined/)};
+
+use strict;
+no strict 'subs'; # allow barewords (eg STDERR) as function arguments
 
 my $arguments = 
@@ -109 +116 @@
     my $optionlistref = $self->{'option_list'};
     my @optionlist = @$optionlistref;
-    my $classifieroptions = pop(@$optionlistref);
+    my $classifieroptions = shift(@$optionlistref);
     return if (!defined($classifieroptions));
 
@@ -177 +184 @@
     my $optionlistref = $self->{'option_list'};
     my @optionlist = @$optionlistref;
-    my $classifieroptions = pop(@$optionlistref);
+    my $classifieroptions = shift(@$optionlistref);
     return if (!defined($classifieroptions));
 
@@ -216 +223 @@
 sub new {
     my ($class) = shift (@_);
-    my ($classifierslist,$args,,$hashArgOptLists) = @_;
+    my ($classifierslist,$args,$hashArgOptLists) = @_;
     push(@$classifierslist, $class);
     my $classifier_name = (defined $classifierslist->[0]) ? $classifierslist->[0] : $class;
@@ -231 +238 @@
     $self->{"info_only"} = 0;
 
-    # Check if gsdlinfo is in the argument list or not.  
-    foreach $strArg (@{$args})
+    # Check if gsdlinfo is in the argument list or not - if it is, don't parse 
+    # the args, just return the object.  
+    foreach my $strArg (@{$args})
     {
-    if($strArg eq "gsdlinfo")
+    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)
+        return bless $self, $class;
+    }
+    }
+
+    # general options available to all classifiers
+    if(!parse2::parse($args,$hashArgOptLists->{"ArgList"},$self))
     {
-    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. 
+    #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;
-    }
+    &gsprintf(STDERR, "\n{BasClas.bad_general_option}\n", $classifier_name);
+    $classTempClass->print_txt_usage("");  # Use default resource bundle
+    die "\n";
+    }
+    
+    delete $self->{"info_only"};
+    return bless $self, $class;
 }
 

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -242 +242 @@
     my $optionlistref = $self->{'option_list'};
     my @optionlist = @$optionlistref;
-    my $pluginoptions = pop(@$optionlistref);
+    my $pluginoptions = shift(@$optionlistref);
     return if (!defined($pluginoptions));
 
@@ -284 +284 @@
     my $optionlistref = $self->{'option_list'};
     my @optionlist = @$optionlistref;
-    my $pluginoptions = pop(@$optionlistref);
+    my $pluginoptions = shift(@$optionlistref);
     return $maxoffset if (!defined($pluginoptions));
 
@@ -311 +311 @@
     my $optionlistref = $self->{'option_list'};
     my @optionlist = @$optionlistref;
-    my $pluginoptions = pop(@$optionlistref);
+    my $pluginoptions = shift(@$optionlistref);
     return if (!defined($pluginoptions));