svn commit: r517311 - in /spamassassin/trunk: build/parse-rules-for-masses rules/23_bayes.cf

[du...@apache.org]

Author: duncf
Date: Mon Mar 12 10:59:30 2007
New Revision: 517311

URL: http://svn.apache.org/viewvc?view=rev&rev=517311
Log:
Fix logic error in parse-rules-for-masses, add bayes tflags to BAYES rules

Modified:
    spamassassin/trunk/build/parse-rules-for-masses
    spamassassin/trunk/rules/23_bayes.cf

Modified: spamassassin/trunk/build/parse-rules-for-masses
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/parse-rules-for-masses?view=diff&rev=517311&r1=517310&r2=517311
==============================================================================
--- spamassassin/trunk/build/parse-rules-for-masses (original)
+++ spamassassin/trunk/build/parse-rules-for-masses Mon Mar 12 10:59:30 2007
@@ -165,45 +165,47 @@
       next;
     }
 
+    my $tflags = $rules->{$rule}->{tflags};
     if (!defined $rules->{$rule}->{score}) {
       my $def = 1.0;
       if ($rule =~ /^T_/) {
         $def = 0.01;
       }
 
-      my $tflags = $rules->{$rule}->{tflags};
       if ($tflags =~ /\bnice\b/) {
         $rules->{$rule}->{score} = -$def;
       } else {
         $rules->{$rule}->{score} = $def;
       }
+    }
 
-      # ignore net rules in set 0 or set 2
-      if ($tflags =~ /\bnet\b/ && ($scoreset & 1) == 0) {
-        $rules->{$rule}->{mutable} = 0;
-        $rules->{$rule}->{score} = 0;
-      }
+    # ignore net rules in set 0 or set 2
+    if ($tflags =~ /\bnet\b/ && ($scoreset & 1) == 0) {
+      $rules->{$rule}->{mutable} = 0;
+      $rules->{$rule}->{score} = 0;
+    }
 
-      # ignore bayes rules in set 0 or set 2
-      if ($tflags =~ /\bbayes\b/ && ($scoreset & 2) == 0) {
-        $rules->{$rule}->{mutable} = 0;
-        $rules->{$rule}->{score} = 0;
-      }
+    # ignore bayes rules in set 0 or set 2
+    if ($tflags =~ /\bbayes\b/ && ($scoreset & 2) == 0) {
+      $rules->{$rule}->{mutable} = 0;
+      $rules->{$rule}->{score} = 0;
+    }
 
-      # if a rule didn't have a score specified, assume it's
-      # mutable
+    # if a rule didn't have a score specified, assume it's
+    # mutable
+    if (!defined $rules->{$rule}->{mutable}) {
       $rules->{$rule}->{mutable} = 1;
+    }
 
-      # although T_ test rules are clamped to 0.01.  this works well
-      # for release mass-checks, at least
-      if ($rule =~ /^T_/) {
-        $rules->{$rule}->{mutable} = 0;
-      }
-      elsif ($rule eq 'AWL') {      # ignore entirely
-        $rules->{$rule}->{mutable} = 0;
-        $rules->{$rule}->{score} = 0;
-      }
+    # although T_ test rules are clamped to 0.01.  this works well
+    # for release mass-checks, at least
+    if ($rule =~ /^T_/) {
+      $rules->{$rule}->{mutable} = 0;
+    } elsif ($rule eq 'AWL') {	# ignore entirely
+      $rules->{$rule}->{mutable} = 0;
+      $rules->{$rule}->{score} = 0;
     }
+
   }
 }
 

Modified: spamassassin/trunk/rules/23_bayes.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/23_bayes.cf?view=diff&rev=517311&r1=517310&r2=517311
==============================================================================
--- spamassassin/trunk/rules/23_bayes.cf (original)
+++ spamassassin/trunk/rules/23_bayes.cf Mon Mar 12 10:59:30 2007
@@ -43,15 +43,15 @@
 body BAYES_95		eval:check_bayes('0.95', '0.99')
 body BAYES_99		eval:check_bayes('0.99', '1.00')
 
-tflags BAYES_00		nice learn
-tflags BAYES_05		nice learn
-tflags BAYES_20		nice learn
-tflags BAYES_40		nice learn
-tflags BAYES_50		learn
-tflags BAYES_60		learn
-tflags BAYES_80		learn
-tflags BAYES_95		learn
-tflags BAYES_99		learn
+tflags BAYES_00		nice learn bayes
+tflags BAYES_05		nice learn bayes
+tflags BAYES_20		nice learn bayes
+tflags BAYES_40		nice learn bayes
+tflags BAYES_50		learn bayes
+tflags BAYES_60		learn bayes
+tflags BAYES_80		learn bayes
+tflags BAYES_95		learn bayes
+tflags BAYES_99		learn bayes
 
 describe BAYES_00	Bayesian spam probability is 0 to 1%
 describe BAYES_05	Bayesian spam probability is 1 to 5%