thh/newsstats
1
0
Fork 0
Code Issues 4 Pull requests Packages Projects Releases Activity

Merge branch 'thh-small-changes' into next

Browse source 
* thh-small-changes:
  Small comment fixes.
  --sums is not compatible with --checkgroups.
This commit is contained in:
Thomas Hochstein 2013-09-03 22:25:13 +02:00
parent 1af57a5390 8dc6823e98
commit 7624accb6e
3 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/gatherstats.pl
View file

@ -73,6 +73,8 @@ $OptStatsType = 'all' if !$OptStatsType;
### get time period from --month ### get time period from --month
# get verbal description of time period, drop SQL code # get verbal description of time period, drop SQL code
my ($Period) = &GetTimePeriod($OptMonth); my ($Period) = &GetTimePeriod($OptMonth);
# bail out if --month is invalid or set to 'ALL';
# we don't support the latter
&Bleat(2,"--month option has an invalid format - please use 'YYYY-MM' or ". &Bleat(2,"--month option has an invalid format - please use 'YYYY-MM' or ".
"'YYYY-MM:YYYY-MM'!") if (!$Period or $Period eq 'all time'); "'YYYY-MM:YYYY-MM'!") if (!$Period or $Period eq 'all time');

15
bin/groupstats.pl
View file

@ -78,9 +78,16 @@ if ($OptReportType) {
$OptReportType = 'default'; $OptReportType = 'default';
} }
} }
# honor $OptCheckgroupsFile,
# warn for $OptSums if set concurrently
my $ValidGroups;
if ($OptCheckgroupsFile) {
# read list of newsgroups from --checkgroups # read list of newsgroups from --checkgroups
# into a hash reference # into a hash reference
my $ValidGroups = &ReadGroupList($OptCheckgroupsFile) if $OptCheckgroupsFile; $ValidGroups = &ReadGroupList($OptCheckgroupsFile);
&Bleat(1,"--sums option can't possibly work with --checkgroups option set")
if $OptSums;
}
### read configuration ### read configuration
my %Conf = %{ReadConfig($OptConfFile)}; my %Conf = %{ReadConfig($OptConfFile)};
@ -375,6 +382,9 @@ example:
See the B<gatherstats> man page for details. See the B<gatherstats> man page for details.
This option does not work together with the B<--checkgroups> option as
all "virtual" groups will not be present in the checkgroups file.
=item B<--checkgroups> I<filename> =item B<--checkgroups> I<filename>
Restrict output to those newgroups present in a file in checkgroups format Restrict output to those newgroups present in a file in checkgroups format
@ -384,6 +394,9 @@ line is ignored). All other newsgroups will be removed from output.
Contrary to B<gatherstats>, I<filename> is not a template, but refers to Contrary to B<gatherstats>, I<filename> is not a template, but refers to
a single file in checkgroups format. a single file in checkgroups format.
The B<--sums> option will not work together with this option as "virtual"
groups will not be present in the checkgroups file.
=item B<-r>, B<--report> I<default|average|sums> =item B<-r>, B<--report> I<default|average|sums>
Choose the report type: I<default>, I<average> or I<sums> Choose the report type: I<default>, I<average> or I<sums>

4
lib/NewsStats.pm
View file

@ -244,7 +244,7 @@ sub ReadGroupList {
### ignoring everything after the first whitespace and so accepting files ### ignoring everything after the first whitespace and so accepting files
### in checkgroups format as well as (parts of) an INN active file) ### in checkgroups format as well as (parts of) an INN active file)
### IN : $Filename : file to read ### IN : $Filename : file to read
### OUT: \%ValidGroups: hash containing all valid newsgroups ### OUT: \%ValidGroups: reference to a hash containing all valid newsgroups
my ($Filename) = @_; my ($Filename) = @_;
my %ValidGroups; my %ValidGroups;
open (my $LIST,"<$Filename") or &Bleat(2,"Cannot read $Filename: $!"); open (my $LIST,"<$Filename") or &Bleat(2,"Cannot read $Filename: $!");
@ -776,5 +776,3 @@ sub CheckValidNewsgroups {
#####------------------------------- done ---------------------------------##### #####------------------------------- done ---------------------------------#####
1; 1;