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

[jm...@apache.org]

Author: jm
Date: Mon May  1 13:36:08 2006
New Revision: 398679

URL: http://svn.apache.org/viewcvs?rev=398679&view=rev
Log:
change ruleqa code to omit the XML comments by default, unless a ?xml=1 parameter is used

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

Modified: spamassassin/trunk/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/mkupdates/listpromotable?rev=398679&r1=398678&r2=398679&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/listpromotable (original)
+++ spamassassin/trunk/build/mkupdates/listpromotable Mon May  1 13:36:08 2006
@@ -21,12 +21,12 @@
 
 ###########################################################################
 
-my $cgi_url = "http://buildbot.spamassassin.org/";
+my $cgi_url = "http://ruleqa.spamassassin.org/";
 my $doc;
 my $cache = 'ruleqa.cache';
 
 if (!$FROM_CACHE || !-f $cache) {
-  my $url = $cgi_url."ruleqa?daterev=last-night";
+  my $url = $cgi_url."last-night?xml=1";
   $doc = get ($url);
   if (!$doc) {
     die "HTTP get failed: $doc\n";

Modified: spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi?rev=398679&r1=398678&r2=398679&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi (original)
+++ spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi Mon May  1 13:36:08 2006
@@ -53,6 +53,7 @@
 precache_params();
 
 my $id_counter = 0;
+my $include_embedded_freqs_xml = 1;
 
 # ---------------------------------------------------------------------------
 
@@ -99,6 +100,9 @@
 $s{detail} = get_url_switch('s_detail', 0);
 $s{g_over_time} = get_url_switch('s_g_over_time', 0);
 
+$s{xml} = get_url_switch('xml', 0);
+$include_embedded_freqs_xml = $s{xml};
+
 # note: age, new, overlap are all now synonyms for detail ;)
 if ($s{age} || $s{overlap} || $s{detail}) {
   $s{age} = 1;
@@ -755,6 +759,9 @@
   close IN;
 }
 
+my $FREQS_LINE_TEMPLATE;
+my $FREQS_EXTRA_TEMPLATE;
+
 sub get_freqs_for_rule {
   my ($key, $strdate, $ruleslist) = @_;
 
@@ -811,6 +818,10 @@
   my @rules = split (' ', $ruleslist);
   if (scalar @rules == 0) { @rules = (''); }
 
+  if ($include_embedded_freqs_xml == 0) {
+    $FREQS_LINE_TEMPLATE =~ s/<!--\s+<rule>.*?-->//gs;
+  }
+
   foreach my $rule (@rules) {
     if ($rule && defined $freqs_data{$key}{$rule}) {
       $comment .= rule_anchor($key,$rule);
@@ -859,9 +870,6 @@
   $str = "<em><tt>".($str || '')."</tt></em><br/>";
   return $str;
 }
-
-my $FREQS_LINE_TEMPLATE;
-my $FREQS_EXTRA_TEMPLATE;
 
 sub set_freqs_templates {
   $FREQS_LINE_TEMPLATE = qq{