Changeset 15881

Timestamp:

2008-06-05T14:27:09+12:00 (16 years ago)

Author:

kjdon

Message:

auxiliary plugins now pass an extra argument to the PrintInfo constructor so that argument parsing is not done - parsing needs to be done by the main plugin which has all the arguments

Location:

gsdl/trunk/perllib/plugins

Files:

• AcronymExtractor.pm (modified) (1 diff)
• DateExtractor.pm (modified) (1 diff)
• EmailAddressExtractor.pm (modified) (1 diff)
• GISExtractor.pm (modified) (1 diff)
• ImageConverter.pm (modified) (1 diff)
• KeyphraseExtractor.pm (modified) (1 diff)
• PrintInfo.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/AcronymExtractor.pm

@@ -33 +33 @@
     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
 
-    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists,1);
 
     return bless $self, $class;

gsdl/trunk/perllib/plugins/DateExtractor.pm

@@ -46 +46 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1);
 
     return bless $self, $class;

gsdl/trunk/perllib/plugins/EmailAddressExtractor.pm

@@ -34 +34 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1);
 
     return bless $self, $class;

gsdl/trunk/perllib/plugins/GISExtractor.pm

@@ -80 +80 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
     #}
-    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1);
 
     if ($self->{'extract_placenames'}) {

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -81 +81 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1);
 
     # Check that ImageMagick is installed and available on the path (except for Windows 95/98)

gsdl/trunk/perllib/plugins/KeyphraseExtractor.pm

@@ -36 +36 @@
     push(@$pluginlist, $class);
 
-    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
-    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
+    push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1);
 
     return bless $self, $class;

gsdl/trunk/perllib/plugins/PrintInfo.pm

@@ -28 +28 @@
         'args'     => $arguments };
 
-
+# $auxiliary_plugin argument passed in by "on-the-side" plugin helpers such as Extractors and ImageConverter. We don't want parsing of args done by them.
 sub new 
 {
     my $class = shift (@_);
-    my ($pluginlist,$args,$hashArgOptLists) = @_;
+    my ($pluginlist,$args,$hashArgOptLists, $auxiliary) = @_;
     my $plugin_name = (defined $pluginlist->[0]) ? $pluginlist->[0] : $class;
 
@@ -55 +55 @@
     }
     
+    if (defined $auxiliary) { # don't parse the args here
+    return bless $self, $class;
+    }
+
     if(parse2::parse($args,$hashArgOptLists->{"ArgList"},$self) == -1)
     {
     my $classTempClass = bless $self, $class;
     print STDERR "<BadPlugin p=$plugin_name>\n";
-    &gsprintf(STDERR, "\n{BasPlug.bad_general_option}\n", $plugin_name);
+    &gsprintf(STDERR, "\n{PrintInfo.bad_general_option}\n", $plugin_name);
     $classTempClass->print_txt_usage("");  # Use default resource bundle
     die "\n";