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

[jm...@apache.org]

Author: jm
Date: Mon Dec 12 10:16:10 2005
New Revision: 356315

URL: http://svn.apache.org/viewcvs?rev=356315&view=rev
Log:
list good rules even in core as 'promotable'

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

Modified: spamassassin/trunk/build/listpromotable
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/listpromotable?rev=356315&r1=356314&r2=356315&view=diff
==============================================================================
--- spamassassin/trunk/build/listpromotable (original)
+++ spamassassin/trunk/build/listpromotable Mon Dec 12 10:16:10 2005
@@ -22,7 +22,7 @@
 # <spc>8.7654</spc><hpc>0.2056</hpc><so>0.977</so>
 # <detailhref>ruleqa%3Fdaterev%3Dlast-night%26rule%3D__HIGHBITS%26s_detail%3D1</detailhref></rule>
 
-my $todump = { };
+# my $todump = { };
 while ($doc =~ m!<rule>(.*?)</rule>!xg) {
   my $xml = $1;
   my $obj = { };
@@ -37,26 +37,29 @@
   my $name = $obj->{test};
   $obj->{detailhref} = $cgi_url.$obj->{detailhref};
 
-  $todump->{$name} = $obj;
-}
-
-if (!scalar keys %$todump) {
-  die "no rules found?\n$doc\n";
-}
-
-my $dump = Data::Dumper->Dump([$todump], ['promolist']);
-# print $dump;
+  ## $todump->{$name} = $obj;
 
-# now write that to a tmp file so 'mkrules' can use it
-my $tmp = new File::Temp( UNLINK => 1, SUFFIX => '.pl' );
-print $tmp $dump;
-
-my $perl = $^X;
-if (!$perl) {
-  die "no perl path found in ARGV!";
+  next unless ($obj->{promo});
+  print "$name\n";
 }
 
-# and exec that script
-exec $perl, "build/mkrules", "--listpromotable=$tmp";
-die "exec failed";
+# if (!scalar keys %$todump) {
+# die "no rules found?\n$doc\n";
+# }
+
+## my $dump = Data::Dumper->Dump([$todump], ['promolist']);
+## # print $dump;
+## 
+## # now write that to a tmp file so 'mkrules' can use it
+## my $tmp = new File::Temp( UNLINK => 1, SUFFIX => '.pl' );
+## print $tmp $dump;
+## 
+## my $perl = $^X;
+## if (!$perl) {
+## die "no perl path found in ARGV!";
+## }
+## 
+## # and exec that script
+## exec $perl, "build/mkrules", "--listpromotable=$tmp";
+## die "exec failed";
 

Modified: spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi?rev=356315&r1=356314&r2=356315&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi (original)
+++ spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi Mon Dec 12 10:16:10 2005
@@ -633,8 +633,9 @@
       my $is_subrule = ($lastrule =~ /^__/);
 
       # assume a default based on rule name; turn off explicitly
-      # the test rules that are not hitting qual thresholds
-      my $promo = ($is_testing && !$is_subrule);
+      # the rules that are not hitting qual thresholds.  list
+      # both testing and core rules.
+      my $promo = (!$is_subrule);
       if ($promochar eq '-') {
         $promo = 0;
       }