chiark / gitweb /
Cope with NNTP_STRLEN abolishment (replaced with NNTP_MAXLEN_COMMAND)
[innduct.git] / innduct-stats-report
index e6a7dcba081e93bf630a4bed3141979c1ec798ed..ebcae748b3fe9843ed198120adc2693e6df1ad1a 100755 (executable)
@@ -64,9 +64,11 @@ while (<>) {
 
 our $cwr;
 our $site;
+our $processed;
 
 foreach $site (sort keys %counts) {
     $cwr= $counts{$site};
+    $processed= $cwr->{offered} - $cwr->{deferred};
     write;
 }
 
@@ -85,14 +87,15 @@ sub amt ($) {
 }
 
 format STDOUT_TOP =
-offrd acctd unwtd rejtd ac% rj% nochk nc% 
+offrd defer acctd unwtd rejtd df% ac% rj% nochk nc% 
 .
 format STDOUT =
-@>>>> @>>>> @>>>> @>>>> ^## ^## @>>>> ^## @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<...
-{ (map { amt($cwr->{$_}) } qw(offered accepted unwanted rejected)),
-  (map { pct($cwr->{$_}, $cwr->{offered}) } qw(accepted rejected)),
+@>>>> @>>>> @>>>> @>>>> @>>>> ^## ^## ^## @>>>> ^## @<<<<<<<<<<<<<<<<<<<<<<<...
+{ (map { amt($cwr->{$_}) } qw(offered deferred accepted unwanted rejected)),
+  (pct($cwr->{deferred}, $cwr->{offered})),
+  (map { pct($cwr->{$_}, $processed) } qw(accepted rejected)),
   ($cwr->{offered_nc} ? (amt($cwr->{offered_nc}),
-                        pct($cwr->{offered_nc}, $cwr->{offered}))
+                        pct($cwr->{offered_nc}, $processed))
                       : ('',undef)),
   ($site)
   }