Changeset 10218 for trunk/gsdl/perllib/plugins/EMAILPlug.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/EMAILPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -113 +113 @@
 
 sub new {
-    my ($class) = @_;
-    my $self = new BasPlug ($class, @_);
-    $self->{'plugin_type'} = "EMAILPlug";
-    # 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^split_exp/.*/^, \$self->{'split_exp'},
-             q^no_attachments^, \$self->{'ignore_attachments'},
-             q^headers^, \$self->{'header_metadata'},
-             "allow_extra_options")) {
-    print STDERR "\nIncorrect options passed to $class.";
-    print STDERR "\nCheck your collect.cfg configuration file\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = (defined $hashArgOptLists)? new SplitPlug($pluginlist,$inputargs,$hashArgOptLists): new SplitPlug($pluginlist,$inputargs);
+
     $self->{'assoc_filenames'} = {}; # to save attach names so we don't clobber
 
@@ -431 +423 @@
 
     
-    if ($self->{'header_metadata'} && $self->{'header_metadata'} == 1) {
+    if ($self->{'headers'} && $self->{'headers'} == 1) {
     # Add "All headers" metadata
     $Headers = &text_into_html($Headers);
@@ -791 +783 @@
     
     # save attachment by default
-    if (!$self->{'ignore_attachments'}
+    if (!$self->{'no_attachments'}
         && $filename ne "") { # this part has a file...
         my $encoding="8bit";