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

Small comment fixes.

Browse source 
Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2013-09-03 17:12:09 +02:00
parent 17ef44085f
commit 8dc6823e98
2 changed files with 9 additions and 9 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');

16
lib/NewsStats.pm
View file

@ -4,7 +4,7 @@
# #
# Copyright (c) 2010-2013 Thomas Hochstein <thh@inter.net> # Copyright (c) 2010-2013 Thomas Hochstein <thh@inter.net>
# #
# This module can be redistributed and/or modified under the same terms under # This module can be redistributed and/or modified under the same terms under
# which Perl itself is published. # which Perl itself is published.
package NewsStats; package NewsStats;
@ -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: $!");
@ -275,12 +275,12 @@ sub GetTimePeriod {
my ($Verbal, $SQL); my ($Verbal, $SQL);
# define a regular expression for a month # define a regular expression for a month
my $REMonth = '\d{4}-\d{2}'; my $REMonth = '\d{4}-\d{2}';
# default to last month if option is not set # default to last month if option is not set
if(!$Month) { if(!$Month) {
$Month = &LastMonth; $Month = &LastMonth;
} }
# check for valid input # check for valid input
if ($Month =~ /^$REMonth$/) { if ($Month =~ /^$REMonth$/) {
# single month (YYYY-MM) # single month (YYYY-MM)
@ -299,7 +299,7 @@ sub GetTimePeriod {
# invalid input # invalid input
return (undef,undef); return (undef,undef);
} }
return ($Verbal,$SQL); return ($Verbal,$SQL);
}; };
@ -407,7 +407,7 @@ sub OutputData {
my %ValidKeys = %{$ValidKeys} if $ValidKeys; my %ValidKeys = %{$ValidKeys} if $ValidKeys;
my ($FileName, $Handle, $OUT); my ($FileName, $Handle, $OUT);
our $LastIteration; our $LastIteration;
# define output types # define output types
my %LegalOutput; my %LegalOutput;
@LegalOutput{('dump','list','pretty')} = (); @LegalOutput{('dump','list','pretty')} = ();
@ -439,7 +439,7 @@ sub OutputData {
# safeguards for filename creation: # safeguards for filename creation:
# replace potential problem characters with '_' # replace potential problem characters with '_'
$FileName = sprintf('%s-%s',$FileTempl,$Caption); $FileName = sprintf('%s-%s',$FileTempl,$Caption);
$FileName =~ s/[^a-zA-Z0-9_-]+/_/g; $FileName =~ s/[^a-zA-Z0-9_-]+/_/g;
open ($OUT,">$FileName") open ($OUT,">$FileName")
or &Bleat(2,sprintf("Cannot open output file '%s': $!", or &Bleat(2,sprintf("Cannot open output file '%s': $!",
$FileName)); $FileName));
@ -776,5 +776,3 @@ sub CheckValidNewsgroups {
#####------------------------------- done ---------------------------------##### #####------------------------------- done ---------------------------------#####
1; 1;