svn commit: r464565 - in /spamassassin/trunk: build/mkrules masses/rule-qa/automc/ruleqa.cgi

[jm...@apache.org]

Author: jm
Date: Mon Oct 16 10:04:05 2006
New Revision: 464565

URL: http://svn.apache.org/viewvc?view=rev&rev=464565
Log:
bug 5047: rule-qa: don't list network rules in non-net mass-checks, even if the mass-checker had --net enabled, since it 'dilutes' their hit stats too much otherwise

Modified:
    spamassassin/trunk/build/mkrules
    spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi

Modified: spamassassin/trunk/build/mkrules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkrules?view=diff&rev=464565&r1=464564&r2=464565
==============================================================================
--- spamassassin/trunk/build/mkrules (original)
+++ spamassassin/trunk/build/mkrules Mon Oct 16 10:04:05 2006
@@ -391,10 +391,19 @@
       {
         $rules->{$name}->{found_definition} = 1;
       }
-      # userconf rules are always published in "active"
-      elsif (($type eq 'tflags') && ($val =~ /\buserconf\b/))
-      {
-        $rules->{$name}->{forceactive} = 1;
+      elsif ($type eq 'tflags') {
+        # userconf rules are always published in "active"
+        if ($val =~ /\buserconf\b/) {
+          $rules->{$name}->{forceactive} = 1;
+        }
+
+        # record for rulemetadata code
+        $val =~ s/\s+/ /gs;
+        if ($rules->{$name}->{tflags}) {
+          $rules->{$name}->{tflags} .= ' '.$val;
+        } else {
+          $rules->{$name}->{tflags} = $val;
+        }
       }
 
       $current_comments = '';
@@ -798,11 +807,13 @@
   if (@s) {
     $mod = $s[9];
   }
+  my $tf = $rules->{$rule}->{tflags} || '';
 
   return "<rulemetadata>".
             "<name>$rule</name>".
             "<src>$srcfile</src>".
             "<srcmtime>$mod</srcmtime>".
+            "<tf>$tf</tf>".
           "</rulemetadata>\n";
 }
 

Modified: spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi?view=diff&rev=464565&r1=464564&r2=464565
==============================================================================
--- spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi (original)
+++ spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi Mon Oct 16 10:04:05 2006
@@ -199,6 +199,8 @@
 
   # turn possibly-empty $self->{daterev} into a real date/rev combo (that exists)
   $self->{daterev} = $self->date_in_direction($self->{daterev}, 0);
+
+  $self->{daterev_md} = $self->get_daterev_metadata($self->{daterev});
 }
 
 # ---------------------------------------------------------------------------
@@ -980,6 +982,8 @@
 
   my $srcpath = $self->{srcpath};
   my $mtime = $self->{mtime};
+  my $no_net_rules = (!$self->{daterev_md}->{includes_net});
+
   if ($srcpath || $mtime) {
     my $rev = $self->get_rev_for_daterev($self->{daterev});
     my $md = $self->get_rule_metadata($rev);
@@ -1001,6 +1005,13 @@
            # !$md->{$_} or !$md->{$_}->{srcmtime} or
           $md->{$_}->{srcmtime} and
              ($md->{$_}->{srcmtime} >= $target);
+         } @rules;
+    }
+
+    if ($no_net_rules) {    # bug 5047
+      @rules = grep {
+          !$md->{$_}->{tf} or
+             ($md->{$_}->{tf} !~ /\bnet\b/);
          } @rules;
     }
   }