Mailing List Archive

svn commit: rev 6787 - in incubator/spamassassin/trunk/lib/Mail: . SpamAssassin
Author: felicity
Date: Thu Feb 19 20:34:47 2004
New Revision: 6787

Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MsgNode.pm
Log:
deal with already_parsed a little better

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm Thu Feb 19 20:34:47 2004
@@ -346,7 +346,7 @@
}

# Generate the main object and parse the appropriate MIME-related headers into it.
- my $msg = Mail::SpamAssassin::Message->new(already_parsed => 0);
+ my $msg = Mail::SpamAssassin::Message->new();
my $header = '';

# Go through all the headers of the message

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Thu Feb 19 20:34:47 2004
@@ -60,17 +60,18 @@
sub new {
my $class = shift;
$class = ref($class) || $class;
- my %opts = @_;
- my $self = $class->SUPER::new(%opts);
+# my %opts = @_;
+# my $self = $class->SUPER::new(%opts);
+ my $self = $class->SUPER::new();

$self->{pristine_headers} = '';
$self->{pristine_body} = '';
- $self->{already_parsed} = 1;
+ $self->{already_parsed} = 0;

- # allow callers to set certain options ...
- foreach ( 'already_parsed' ) {
- $self->{$_} = $opts{$_} if ( exists $opts{$_} );
- }
+# # allow callers to set certain options ...
+# foreach ( 'already_parsed' ) {
+# $self->{$_} = $opts{$_} if ( exists $opts{$_} );
+# }

bless($self,$class);


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MsgNode.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MsgNode.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/MsgNode.pm Thu Feb 19 20:34:47 2004
@@ -81,8 +81,7 @@
}

# We have 2 functions in find_parts() to optimize out the penalty of
-# 'already_parsed' (in Message), $onlyleaves, $re,
-# and $recursive over and over again.
+# $onlyleaves, $re, and $recursive over and over again.
#
sub _find_parts {
my ($self, $re, $onlyleaves, $recursive) = @_;