svn commit: r507951 - /spamassassin/trunk/build/parse-rules-for-masses

[jm...@apache.org]

Author: jm
Date: Thu Feb 15 07:06:58 2007
New Revision: 507951

URL: http://svn.apache.org/viewvc?view=rev&rev=507951
Log:
ensure rule-parsing inherently knows about bayes/net scoresets

Modified:
    spamassassin/trunk/build/parse-rules-for-masses

Modified: spamassassin/trunk/build/parse-rules-for-masses
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/parse-rules-for-masses?view=diff&rev=507951&r1=507950&r2=507951
==============================================================================
--- spamassassin/trunk/build/parse-rules-for-masses (original)
+++ spamassassin/trunk/build/parse-rules-for-masses Thu Feb 15 07:06:58 2007
@@ -171,10 +171,23 @@
         $def = 0.01;
       }
 
-      if ($rules->{$rule}->{tflags} =~ /nice/) {
+      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 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