-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
BTW while it's generally a good commit and I'm +1, that removes a
*non*-no-op;
> - my $txt = $self->{conf}->{full_tests}->{$rule};
> - $txt ||= $self->{conf}->{full_evals}->{$rule};
> - $txt ||= $self->{conf}->{head_tests}->{$rule};
> - $txt ||= $self->{conf}->{body_tests}->{$rule};
these lines will attempt to provide a fall-back description line, if the
rules file omitted one. This is pretty vestigial, but I'd like to keep
some kind of code for a default description string (the rule name,
perhaps?).
- --j.
[EMAIL PROTECTED] writes:
> Author: jgmyers
> Date: Tue Nov 15 11:59:56 2005
> New Revision: 344423
>
> URL: http://svn.apache.org/viewcvs?rev=344423&view=rev
> Log:
> Remove no-effect code, fold handle_hit into got_hit
>
> Modified:
> spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
>
> Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
> URL:
> http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=344423&r1=344422&r2=344423&view=diff
> ==============================================================================
> --- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
> +++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Tue Nov 15
> 11:59:56 2005
> @@ -2804,28 +2804,17 @@
> $wrapped;
> }
>
> -sub handle_hit {
> - my ($self, $rule, $area, $deffallbackdesc) = @_;
> +sub got_hit {
> + my ($self, $rule, $area) = @_;
> +
> + $self->{tests_already_hit}->{$rule} = 1;
>
> my $desc = $self->{conf}->{descriptions}->{$rule};
> - $desc ||= $deffallbackdesc;
> $desc ||= $rule;
>
> my $score = $self->{conf}->{scores}->{$rule};
>
> $self->_handle_hit($rule, $score, $area, $desc);
> -}
> -
> -sub got_hit {
> - my ($self, $rule, $prepend2desc) = @_;
> -
> - $self->{tests_already_hit}->{$rule} = 1;
> -
> - my $txt = $self->{conf}->{full_tests}->{$rule};
> - $txt ||= $self->{conf}->{full_evals}->{$rule};
> - $txt ||= $self->{conf}->{head_tests}->{$rule};
> - $txt ||= $self->{conf}->{body_tests}->{$rule};
> - $self->handle_hit ($rule, $prepend2desc, $txt);
> }
>
> sub test_log {
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Exmh CVS
iD8DBQFDelNbMJF5cimLx9ARAjhAAKCKxz7M/5LSFecRn9cAPCrJyA48hgCfXsK8
k+jt7ZH35nnYd5tWoQIiuKM=
=GgLZ
-----END PGP SIGNATURE-----
