Mailing List Archive

Author: jm
Date: Mon Oct 31 15:56:22 2005
New Revision: 329937

URL: http://svn.apache.org/viewcvs?rev=329937&view=rev
Log:
add another info file for less-expensive data

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

Modified: spamassassin/trunk/masses/rule-qa/automc/gen_info_xml
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/automc/gen_info_xml?rev=329937&r1=329936&r2=329937&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/automc/gen_info_xml (original)
+++ spamassassin/trunk/masses/rule-qa/automc/gen_info_xml Mon Oct 31 15:56:22 2005
@@ -25,6 +25,16 @@

foreach my $dr (@daterevs) {
my $drdir = get_datadir_for_daterev($dr);
+
+ # this one is always rebuilt.
+ print "$drdir/fastinfo.xml: creating...\n";
+ my $fastinfo = get_fastinfo($dr, $drdir);
+ open (OUT, ">$drdir/fastinfo.xml") or die "cannot write $drdir/fastinfo.xml";
+ print OUT $fastinfo;
+ close OUT or die "failed to write to $drdir/fastinfo.xml";
+
+ # this one is only built if it doesn't already exist, because
+ # it's quite expensive to build
if (-f "$drdir/info.xml" && -s _) {
print "$drdir/info.xml: good\n";
next;
@@ -45,9 +55,6 @@
my $rev = $2;

my $info = {
- date => $date,
- rev => $rev,
- includes_net => 0
};

if (!$svn_log) {
@@ -63,11 +70,50 @@
last;
}

+ return XMLout($info);
+}
+
+sub get_fastinfo {
+ my ($dr, $drdir) = @_;
+
+ $dr =~ /^(\d+)[-\/]r(\d+)$/;
+ my $date = $1;
+ my $rev = $2;
+
+ my $info = {
+ date => $date,
+ rev => $rev,
+ includes_net => 0
+ };
+
if (-f "$drdir/NET.all") {
$info->{includes_net} = 1;
}

+ $info->{submitters} = '';
+ if (-f "$drdir/DETAILS.all") {
+ read_submitters("$drdir/DETAILS.all", $info);
+ }
+
return XMLout($info);
+}
+
+sub read_submitters {
+ my ($fname, $info) = @_;
+
+ open (IN, "<$fname") or warn "cannot read $fname";
+ while (<IN>) {
+ # spam results used for 329933 DETAILS all: spam-mc-fast.log spam-foo.log
+ if (/^# spam results used for \S+ \S+ \S+: (.*)$/) {
+ my $sub = $1;
+ $sub =~ s/\bspam-/ /;
+ $sub =~ s/\.log\b/ /;
+ $sub =~ s/\s+/ /gs;
+ $info->{submitters} = $sub;
+ }
+ last if (!/^#/); # don't want anything after the comments end
+ }
+ close IN;
}

sub get_all_daterevs {

Modified: spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi?rev=329937&r1=329936&r2=329937&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi (original)
+++ spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi Mon Oct 31 15:56:22 2005
@@ -277,9 +277,11 @@

if (!$dr) {
$tmpl =~ s,!daylink${key}!,
- <td colspan=5>
+
+ <td colspan=6 class=daterevtd>
<em>(no logs available)</em>
</td>
+
,gs;
}
else {
@@ -821,17 +823,19 @@
sub get_daterev_description {
my ($dr) = @_;
my $fname = get_datadir_for_daterev($dr)."/info.xml";
+ my $fastfname = get_datadir_for_daterev($dr)."/fastinfo.xml";

my $txt;
if (-f $fname) {
eval {
my $info = XMLin($fname);
+ my $fastinfo = XMLin($fastfname);
# use Data::Dumper; print Dumper $info;

my $cdate = $info->{checkin_date};
$cdate =~ s/T(\S+)\.\d+Z$/ $1/;

- my $net = $info->{includes_net} ? "[net]" : "";
+ my $net = $fastinfo->{includes_net} ? "[net]" : "";

my $drtitle = ($info->{msg} ? $info->{msg} : '');
$drtitle =~ s/[\"\']/ /gs;
@@ -841,9 +845,9 @@
$txt = qq{

<td class=daterevtd>
- <a title="$drtitle" href="!drhref!">$info->{date}</a></td>
+ <a title="$drtitle" href="!drhref!">$fastinfo->{date}</a></td>
<td class=daterevtd>
- <a title="$drtitle" href="!drhref!">$info->{rev}</a></td>
+ <a title="$drtitle" href="!drhref!">$fastinfo->{rev}</a></td>
<td class=daterevtd>
<a title="$drtitle" href="!drhref!">$cdate</a></td>
<td class=daterevtd>
@@ -852,7 +856,9 @@
<td class=daterevtd> <em>$net</em> </td>

</tr><tr class=daterevdesc><td></td>
- <td class=daterevtd colspan=4><em>($drtitle)</em></td>
+ <td class=daterevtd colspan=4><em>($drtitle)
+ <br>$fastinfo->{submitters}
+ </em></td>
<td></td><td></td>

};