tyler.durden
/
squidanalyzer
mirror of https://github.com/darold/squidanalyzer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent buildHtml to create directories on empty date

This commit is contained in:
Darold Gilles 2012-04-26 10:07:51 +02:00
parent 78db98c96c
commit 17c70b1959
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SquidAnalyzer.pm
View File

@ -274,7 +274,9 @@ sub parseFile
for my $date ("$self->{first_year}$self->{first_month}" .. "$self->{last_year}$self->{last_month}") { for my $date ("$self->{first_year}$self->{first_month}" .. "$self->{last_year}$self->{last_month}") {
$date =~ /^(\d{4})(\d{2})$/; $date =~ /^(\d{4})(\d{2})$/;
next if (($2 < 1) || ($2 > 12)); next if (($2 < 1) || ($2 > 12));
$self->_save_data("$1", "$2"); if (-d "$self->{Output}/$1/$2") {
$self->_save_data("$1", "$2");
}
} }
# Compute year statistics # Compute year statistics
@ -282,7 +284,9 @@ sub parseFile
print STDERR "Compute and dump year statistics for $self->{first_year} to $self->{last_year}\n"; print STDERR "Compute and dump year statistics for $self->{first_year} to $self->{last_year}\n";
} }
for my $year ($self->{first_year} .. $self->{last_year}) { for my $year ($self->{first_year} .. $self->{last_year}) {
$self->_save_data($year); if (-d "$self->{Output}/$year") {
$self->_save_data($year);
}
} }
} }
@ -1110,17 +1114,17 @@ sub buildHTML
opendir(DIR, $outdir) || die "Error: can't opendir $outdir: $!"; opendir(DIR, $outdir) || die "Error: can't opendir $outdir: $!";
my @years = grep { /^\d{4}$/ && -d "$outdir/$_"} readdir(DIR); my @years = grep { /^\d{4}$/ && -d "$outdir/$_"} readdir(DIR);
closedir DIR; closedir DIR;
foreach my $y (@years) { foreach my $y (sort {$a <=> $b} @years) {
next if ($y < $old_year); next if ($y < $old_year);
opendir(DIR, "$outdir/$y") || die "Error: can't opendir $outdir/$y: $!"; opendir(DIR, "$outdir/$y") || die "Error: can't opendir $outdir/$y: $!";
my @months = grep { /^\d{2}$/ && -d "$outdir/$y/$_"} readdir(DIR); my @months = grep { /^\d{2}$/ && -d "$outdir/$y/$_"} readdir(DIR);
closedir DIR; closedir DIR;
foreach my $m (@months) { foreach my $m (sort {$a <=> $b} @months) {
next if ($m < $old_month); next if ($m < $old_month);
opendir(DIR, "$outdir/$y/$m") || die "Error: can't opendir $outdir/$y/$m: $!"; opendir(DIR, "$outdir/$y/$m") || die "Error: can't opendir $outdir/$y/$m: $!";
my @days = grep { /^\d{2}$/ && -d "$outdir/$y/$m/$_"} readdir(DIR); my @days = grep { /^\d{2}$/ && -d "$outdir/$y/$m/$_"} readdir(DIR);
closedir DIR; closedir DIR;
foreach my $d (@days) { foreach my $d (sort {$a <=> $b} @days) {
next if ($d < $old_day); next if ($d < $old_day);
print STDERR "Generating daily statistics for day $y-$m-$d\n" if (!$self->{QuietMode}); print STDERR "Generating daily statistics for day $y-$m-$d\n" if (!$self->{QuietMode});
$self->gen_html_output($outdir, $y, $m, $d); $self->gen_html_output($outdir, $y, $m, $d);