diff --git a/SquidAnalyzer.pm b/SquidAnalyzer.pm index dedf923..6ded662 100644 --- a/SquidAnalyzer.pm +++ b/SquidAnalyzer.pm @@ -273,7 +273,7 @@ sub parseFile $found = 1; last; } - } + } next if ($found); } # check for client exclusion @@ -283,7 +283,7 @@ sub parseFile $found = 1; last; } - } + } next if ($found); } # check for URL exclusion @@ -449,7 +449,7 @@ sub _init $self->{TopUrlUser} = $options{TopUrlUser} || 0; $self->{no_year_stat} = 0; $self->{UseClientDNSName} = $options{UseClientDNSName} || 0; - + if ($self->{Lang}) { open(IN, "$self->{Lang}") or die "ERROR: can't open translation file $self->{Lang}, $!\n"; while (my $l = ) { @@ -508,7 +508,7 @@ sub _init } elsif (uc($self->{TransfertUnit}) eq 'GB') { $self->{TransfertUnitValue} = 1024*1024*1024; } - } + } # Init statistics storage hashes $self->_clear_stats(); @@ -820,7 +820,7 @@ sub _save_stat foreach my $id (sort {$a cmp $b} keys %{$self->{"stat_user_$type"}}) { my $name = $id; $name =~ s/\s+//g; - $dat_file_user->print("$name hits_$type="); + $dat_file_user->print("$name hits_$type="); foreach my $tmp (sort {$a <=> $b} keys %{$self->{"stat_user_$type"}{$id}}) { $dat_file_user->print("$tmp:" . $self->{"stat_user_$type"}{$id}{$tmp}{hits} . ","); } @@ -844,7 +844,7 @@ sub _save_stat $dat_file_network->open(">$self->{Output}/$path/stat_network.dat") or die "ERROR: Can't write to file $self->{Output}/$path/stat_network.dat, $!\n"; foreach my $net (sort {$a cmp $b} keys %{$self->{"stat_network_$type"}}) { - $dat_file_network->print("$net\thits_$type="); + $dat_file_network->print("$net\thits_$type="); foreach my $tmp (sort {$a <=> $b} keys %{$self->{"stat_network_$type"}{$net}}) { $dat_file_network->print("$tmp:" . $self->{"stat_network_$type"}{$net}{$tmp}{hits} . ","); } @@ -977,9 +977,9 @@ sub _read_stat $self->{"stat_usermax_$sum_type"}{$id}{largest_file_size} = $5; $self->{"stat_usermax_$sum_type"}{$id}{largest_file_url} = $6; } - $hits =~ s/,$//; - $bytes =~ s/,$//; - $duration =~ s/,$//; + $hits =~ s/,$//; + $bytes =~ s/,$//; + $duration =~ s/,$//; my %hits_tmp = split(/[:,]/, $hits); foreach my $tmp (sort {$a <=> $b} keys %hits_tmp) { if ($key ne '') { $k = $key; } else { $k = $tmp; } @@ -1054,9 +1054,9 @@ sub _read_stat $self->{"stat_netmax_$sum_type"}{$net}{largest_file_size} = $4; $self->{"stat_netmax_$sum_type"}{$net}{largest_file_url} = $5; } - $hits =~ s/,$//; - $bytes =~ s/,$//; - $duration =~ s/,$//; + $hits =~ s/,$//; + $bytes =~ s/,$//; + $duration =~ s/,$//; my %hits_tmp = split(/[:,]/, $hits); foreach my $tmp (sort {$a <=> $b} keys %hits_tmp) { if ($key ne '') { $k = $key; } else { $k = $tmp; } @@ -1124,8 +1124,8 @@ sub _read_stat my $code = $1; my $hits = $2 || ''; my $bytes = $3 || ''; - $hits =~ s/,$//; - $bytes =~ s/,$//; + $hits =~ s/,$//; + $bytes =~ s/,$//; my %hits_tmp = split(/[:,]/, $hits); foreach my $tmp (sort {$a <=> $b} keys %hits_tmp) { if ($key ne '') { $k = $key; } else { $k = $tmp; } @@ -1767,9 +1767,9 @@ sub _print_network_stat my $duration = $3 || ''; $network_stat{$network}{largest_file} = $4; $network_stat{$network}{url} = $5; - $hits =~ s/,$//; - $bytes =~ s/,$//; - $duration =~ s/,$//; + $hits =~ s/,$//; + $bytes =~ s/,$//; + $duration =~ s/,$//; my %hits_tmp = split(/[:,]/, $hits); foreach my $tmp (sort {$a <=> $b} keys %hits_tmp) { $detail_network_stat{$network}{$tmp}{hits} = $hits_tmp{$tmp}; @@ -2137,6 +2137,7 @@ sub _print_user_stat last; } } + $show =~ s/_/ /g; my $url = &escape($usr); my $comma_bytes = $self->format_bytes($user_stat{$usr}{bytes}); if ($self->{UrlReport}) { @@ -2406,7 +2407,7 @@ sub _print_user_detail }; - + foreach my $url (sort { $url_stat{$b}{"$self->{OrderUrl}"} <=> $url_stat{$a}{"$self->{OrderUrl}"} } keys %url_stat) { my $h_percent = '0.0'; $h_percent = sprintf("%2.2f", ($url_stat{$url}{hits}/$total_hit) * 100) if ($total_hit); @@ -2585,7 +2586,7 @@ sub _print_top_url_stat } } print $out "\n"; - if (exists $url_stat{$u}{users}) { + if (exists $url_stat{$u}{users}) { print $out qq{