Changeset 15881
- Timestamp:
- 2008-06-05T14:27:09+12:00 (16 years ago)
- Location:
- gsdl/trunk/perllib/plugins
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/perllib/plugins/AcronymExtractor.pm
r15867 r15881 33 33 if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)}; 34 34 35 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists );35 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists,1); 36 36 37 37 return bless $self, $class; -
gsdl/trunk/perllib/plugins/DateExtractor.pm
r15867 r15881 46 46 push(@{$hashArgOptLists->{"OptList"}},$options); 47 47 48 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists );48 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1); 49 49 50 50 return bless $self, $class; -
gsdl/trunk/perllib/plugins/EmailAddressExtractor.pm
r15867 r15881 34 34 push(@{$hashArgOptLists->{"OptList"}},$options); 35 35 36 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists );36 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1); 37 37 38 38 return bless $self, $class; -
gsdl/trunk/perllib/plugins/GISExtractor.pm
r15872 r15881 80 80 push(@{$hashArgOptLists->{"OptList"}},$options); 81 81 #} 82 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists );82 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1); 83 83 84 84 if ($self->{'extract_placenames'}) { -
gsdl/trunk/perllib/plugins/ImageConverter.pm
r15866 r15881 81 81 push(@{$hashArgOptLists->{"OptList"}},$options); 82 82 83 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists );83 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1); 84 84 85 85 # Check that ImageMagick is installed and available on the path (except for Windows 95/98) -
gsdl/trunk/perllib/plugins/KeyphraseExtractor.pm
r15867 r15881 36 36 push(@$pluginlist, $class); 37 37 38 if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}39 if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};38 push(@{$hashArgOptLists->{"ArgList"}},@{$arguments}); 39 push(@{$hashArgOptLists->{"OptList"}},$options); 40 40 41 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists );41 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1); 42 42 43 43 return bless $self, $class; -
gsdl/trunk/perllib/plugins/PrintInfo.pm
r15868 r15881 28 28 'args' => $arguments }; 29 29 30 30 # $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. 31 31 sub new 32 32 { 33 33 my $class = shift (@_); 34 my ($pluginlist,$args,$hashArgOptLists ) = @_;34 my ($pluginlist,$args,$hashArgOptLists, $auxiliary) = @_; 35 35 my $plugin_name = (defined $pluginlist->[0]) ? $pluginlist->[0] : $class; 36 36 … … 55 55 } 56 56 57 if (defined $auxiliary) { # don't parse the args here 58 return bless $self, $class; 59 } 60 57 61 if(parse2::parse($args,$hashArgOptLists->{"ArgList"},$self) == -1) 58 62 { 59 63 my $classTempClass = bless $self, $class; 60 64 print STDERR "<BadPlugin p=$plugin_name>\n"; 61 &gsprintf(STDERR, "\n{ BasPlug.bad_general_option}\n", $plugin_name);65 &gsprintf(STDERR, "\n{PrintInfo.bad_general_option}\n", $plugin_name); 62 66 $classTempClass->print_txt_usage(""); # Use default resource bundle 63 67 die "\n";
Note:
See TracChangeset
for help on using the changeset viewer.