You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by du...@apache.org on 2004/12/01 05:13:09 UTC
svn commit: r109274 - /spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm /spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm /spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Author: duncf
Date: Tue Nov 30 20:13:08 2004
New Revision: 109274
URL: http://svn.apache.org/viewcvs?view=rev&rev=109274
Log:
bug 1670: Added some new tags for AWL status
_AWLMEAN_
_AWLCOUNT_
_AWLPRESCORE_
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm?view=diff&rev=109274&p1=spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm&r1=109273&p2=spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm&r2=109274
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm Tue Nov 30 20:13:08 2004
@@ -128,6 +128,21 @@
###########################################################################
+=item awl->count();
+
+This method will return the count of messages used in determining the
+whitelist correction.
+
+=cut
+
+sub count {
+ my $self = shift;
+ return $self->{entry}->{count};
+}
+
+
+###########################################################################
+
=item awl->add_score($score);
This method will add half the score to the current entry. Half the
@@ -161,6 +176,7 @@
return $self->modify_address($addr, -100);
}
+
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&rev=109274&p1=spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm&r1=109273&p2=spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm&r2=109274
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Tue Nov 30 20:13:08 2004
@@ -3085,6 +3085,9 @@
_HAMMYTOKENS(N)_ the N most significant hammy tokens (default, 5)
_SPAMMYTOKENS(N)_ the N most significant spammy tokens (default, 5)
_AWL_ AWL modifier
+ _AWLMEAN_ Mean score on which AWL modification is based
+ _AWLCOUNT_ Number of messages on which AWL modicfication is based
+ _AWLPRESCORE_ Score before AWL
_DATE_ rfc-2822 date of scan
_STARS(*)_ one * (use any character) for each score point (note: this
is limited to 50 'stars' to stay on the right side of the RFCs)
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&rev=109274&p1=spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm&r1=109273&p2=spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm&r2=109274
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Tue Nov 30 20:13:08 2004
@@ -910,6 +910,10 @@
$delta = ($meanscore - $awlpoints) * $self->{main}->{conf}->{auto_whitelist_factor};
$self->{tag_data}->{AWL} = sprintf("%2.1f",$delta);
# Save this for _AWL_ tag
+
+ $self->{tag_data}->{AWLMEAN} = sprintf("%2.1f", $meanscore);
+ $self->{tag_data}->{AWLCOUNT} = sprintf("%2.1f", $whitelist->count());
+ $self->{tag_data}->{AWLPRESCORE} = sprintf("%2.1f", $self->{score});
}
# Update the AWL *before* adding the new score, otherwise
Re: svn commit: r109274 - /spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm /spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm /spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Posted by Duncan Findlay <du...@debian.org>.
On Tue, Nov 30, 2004 at 08:49:36PM -0800, Daniel Quinlan wrote:
> duncf@apache.org writes:
>
> > bug 1670: Added some new tags for AWL status
>
> Do we still need this? It's been requested once in 2 years.
It's trivial. I think the more available tags, the better, but we do
need to organize the man page better as it gets more cluttered...
> Also, it's not bug 1670.... which bug is it?
1683, sorry.
> > + _AWLCOUNT_ Number of messages on which AWL modicfication is based
>
> typo
Fixed.
--
Duncan Findlay
Re: svn commit: r109274 - /spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm /spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm /spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Posted by Daniel Quinlan <qu...@pathname.com>.
duncf@apache.org writes:
> bug 1670: Added some new tags for AWL status
Do we still need this? It's been requested once in 2 years.
Also, it's not bug 1670.... which bug is it?
> + _AWLCOUNT_ Number of messages on which AWL modicfication is based
typo
--
Daniel Quinlan
http://www.pathname.com/~quinlan/
Re: svn commit: r109274 - /spamassassin/trunk/lib/Mail/SpamAssassin/AutoWhitelist.pm /spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm /spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Posted by Daniel Quinlan <qu...@pathname.com>.
duncf@apache.org writes:
> bug 1670: Added some new tags for AWL status
Do we still need this? It's been requested once in 2 years.
Also, it's not bug 1670.... which bug is it?
> + _AWLCOUNT_ Number of messages on which AWL modicfication is based
typo
--
Daniel Quinlan
http://www.pathname.com/~quinlan/