You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2006/11/01 14:59:39 UTC
svn commit: r469907 - /spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi
Author: jm
Date: Wed Nov 1 05:59:38 2006
New Revision: 469907
URL: http://svn.apache.org/viewvc?view=rev&rev=469907
Log:
bug 5125: add a 'text format' button for freqs tables in the ruleqa app so that freqs can be pasted nicely
Modified:
spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi
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=469907&r1=469906&r2=469907
==============================================================================
--- spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi (original)
+++ spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi Wed Nov 1 05:59:38 2006
@@ -52,6 +52,7 @@
use constant DATEREV_ADJ => - (8 * 60 * 60);
my $FREQS_LINE_TEMPLATE;
+my $FREQS_LINE_TEXT_TEMPLATE;
my $FREQS_EXTRA_TEMPLATE;
our %AUTOMC_CONF;
@@ -950,8 +951,15 @@
<pre class=head>$heads</pre>
</div>
+ <div id="txt_$headers_id" class=headdiv style='display: none'>
+ <p class=headclosep align=right><a
+ href="javascript:hide_header('txt_$headers_id')">[close]</a></p>
+ <pre class=head><<<TEXTS>>></pre>
+ </div>
+
<br clear="all"/>
<p class=showfreqslink><a
+ href="javascript:show_header('txt_$headers_id')">(pasteable)</a><a
href="javascript:show_header('$headers_id')">(source details)</a>
<a name='$titleplink' href='#$titleplink' class=title_permalink>(#)</a>
</p>
@@ -1033,10 +1041,15 @@
$FREQS_LINE_TEMPLATE =~ s/<!--\s+<rule>.*?-->//gs;
}
+ my $texts = '';
foreach my $rule (@rules) {
if ($rule && defined $self->{freqs_data}{$key}{$rule}) {
$comment .= $self->rule_anchor($key,$rule);
$comment .= $self->output_freqs_data_line($self->{freqs_data}{$key}{$rule},
+ \$FREQS_LINE_TEMPLATE,
+ $header_context);
+ $texts .= $self->output_freqs_data_line($self->{freqs_data}{$key}{$rule},
+ \$FREQS_LINE_TEXT_TEMPLATE,
$header_context);
}
else {
@@ -1046,8 +1059,12 @@
(no data found)
</td></tr>
";
+ $texts .= " (no data found) ";
}
}
+
+ # insert the text into that template
+ $comment =~ s/<<<TEXTS>>>/$texts/gs;
print $comment;
print "</table>";
@@ -1087,6 +1104,11 @@
};
+ $FREQS_LINE_TEXT_TEMPLATE = qq{
+ [% USE format %][% fmt = format('%7s') %]
+ [% fmt(MSECS) %] [% fmt(SPAMPC) %] [% fmt(HAMPC) %] [% fmt(SO) %] [% fmt(SCORE) %] [% NAME %] [% USERNAME %] [% AGE %]
+ };
+
$FREQS_EXTRA_TEMPLATE = qq{
<tr class=freqsextra>
@@ -1174,7 +1196,7 @@
}
sub output_freqs_data_line {
- my ($self, $obj, $header_context) = @_;
+ my ($self, $obj, $template, $header_context) = @_;
# normal freqs lines, with optional subselector after rule name
my $out = '';
@@ -1196,7 +1218,7 @@
$score = '(n/a)';
}
- $self->{ttk}->process(\$FREQS_LINE_TEMPLATE, {
+ $self->{ttk}->process($template, {
RULEDETAIL => $detailurl,
MSECS => $line->{msecs},
SPAMPC => $line->{spampc},