svn commit: r553070 - /spamassassin/trunk/masses/hit-frequencies

[fe...@apache.org]

Author: felicity
Date: Tue Jul  3 21:31:29 2007
New Revision: 553070

URL: http://svn.apache.org/viewvc?view=rev&rev=553070
Log:
While we expect rule listings will only have a unique listing of rules, there could be duplicates, so only count them once per message.

Modified:
    spamassassin/trunk/masses/hit-frequencies

Modified: spamassassin/trunk/masses/hit-frequencies
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/hit-frequencies?view=diff&rev=553070&r1=553069&r2=553070
==============================================================================
--- spamassassin/trunk/masses/hit-frequencies (original)
+++ spamassassin/trunk/masses/hit-frequencies Tue Jul  3 21:31:29 2007
@@ -690,6 +690,7 @@
         ($caught, $score, $restofline) = split(\' \', $_, 3);
         next unless ($caught =~ /^[Y\.]$/ && $restofline);
         (undef, $rules) = split(/ /, $restofline, 3);
+	my %freq_mesg = ();
     ';
 
     if ($opt_f) {
@@ -722,7 +723,7 @@
 
       $evalstr .= '
         foreach my $r (split(/,/, $rules)) {
-          $freq_spam{$r}++;
+          $freq_spam{$r}++ unless $freq_mesg{$r}++;
           '.$hmapstr.$smapstr.'
         }
         $num_spam++;
@@ -743,7 +744,7 @@
 
       $evalstr .= '
         foreach my $r (split(/,/, $rules)) {
-          $freq_ham{$r}++;
+          $freq_ham{$r}++ unless $freq_mesg{$r}++;
           '.$hmapstr.$smapstr.'
         }
         $num_ham++;