From 837eeb79cd78dba41c8f79e72b9b4611de506814 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 11 Sep 2013 14:20:38 +0100
Subject: [PATCH] better grouping of news entries

---
 cgi | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/cgi b/cgi
index 4890374..c35a5b2 100755
--- a/cgi
+++ b/cgi
@@ -206,13 +206,17 @@ our @news_graphs;
 
 foreach my $site (keys %news_sources) {
     my $sk= $site;
+    $sk =~ s/^[.0-9]+$/~$&/;
     for (;;) {
         last unless $sk =~
-  s/^[^. ]*\b(?:chiark|greenend|news|nntp|peer|feed|in|out)\b[^.]*\.//;
+ s/^[^. ]*\b(?:chiark|greenend|news|newsfeed|nntp|peer|feed|in|out)\b[^.]*\.//;
         $sk .= " $&";
     }
+print STDERR "$site => $sk\n";
     foreach my $inout (keys %{ $news_sources{$site} }) {
-        push @news_graphs, [ "$sk $inout", $site, $inout ];
+	my $skio = $sk;
+	$skio =~ s/ / [$inout]/;
+        push @news_graphs, [ $skio, $site, $inout ];
     }
 }
 
@@ -238,7 +242,10 @@ foreach my $siteinfo (sort { $a->[0] cmp $b->[0] } @news_graphs) {
             push @defs, "CDEF:kb_$`=$val,1024,/";
         }
     }
-    graph_of_group("News", $site, $inout,
+    my $group = $sortkey;
+    $group =~ s/ .*//;
+    $group = $site unless length $group;
+    graph_of_group("News", $group, "$site $inout",
 	  {
 		Units => '[art/s]',
 		TimeRanges => [ map { $_*86400 } qw(1 7 31), 366, 366*3 ]
@@ -260,7 +267,8 @@ foreach my $siteinfo (sort { $a->[0] cmp $b->[0] } @news_graphs) {
 	   "CDEF:kb_accepted_smooth=kb_accepted,<interval/60>,TREND",
 	   "LINE:kb_duplicate#ff0:kb dupe",
 	   "LINE:kb_accepted_smooth#008:~kb",
-	   ]);
+	   ],
+	"$site $inout");
 }
 
 our %disk_rdev2rrd;
-- 
2.30.2