Changeset 10218 for trunk/gsdl/perllib/plugins/PSPlug.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/plugins/PSPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/PSPlug.pm

@@ -62 +62 @@
 
 sub new {
-    my $class = shift (@_);
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
 
-    # title_sub removes leading "Page 1" or "1 " from auto-extracted title.
+    push(@$inputargs,"-convert_to");
+    push(@$inputargs,"text");
+    push(@$inputargs,"-title_sub");
+    push(@$inputargs,'^(Page\s+\d+)?(\s*1\s+)?');
 
-    my $self = new ConvertToPlug ($class, "-convert_to", "text", @_ , "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
-    $self->{'plugin_type'} = "PSPlug";
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
-    
-    if (!parsargv::parse(\@_, 
-             q^extract_date^, \$self->{'extract_date'},
-             q^extract_pages^, \$self->{'extract_pages'},
-             q^extract_title^, \$self->{'extract_title'},
-             "allow_extra_options")) {
-    print STDERR "\nIncorrect options passed to HTMLPlug, check your collect.cfg configuration file\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = (defined $hashArgOptLists)? new ConvertToPlug($pluginlist,$inputargs,$hashArgOptLists): new ConvertToPlug($pluginlist,$inputargs);
 
     return bless $self, $class;