diff --git a/SquidAnalyzer.pm b/SquidAnalyzer.pm index aced2b5..bc039ed 100644 --- a/SquidAnalyzer.pm +++ b/SquidAnalyzer.pm @@ -3910,6 +3910,9 @@ sub _print_network_stat $unit = $Translate{'Months'} || 'Months'; } + my $trfunit = $self->{TransfertUnit} || 'B'; + $trfunit = 'B' if ($trfunit eq 'BYTE'); + print $out "

$Translate{'Network_number'}: $nnet

\n"; print $out qq{ @@ -3919,7 +3922,7 @@ sub _print_network_stat - + }; print $out qq{ @@ -4205,6 +4208,9 @@ sub _print_user_stat print $out "

$Translate{'User_number'}: $nuser

\n"; + my $trfunit = $self->{TransfertUnit} || 'B'; + $trfunit = 'B' if ($trfunit eq 'BYTE'); + print $out qq{
$Translate{'Requests'} (%) $Translate{$self->{TransfertUnit}} (%) $Translate{'Duration'} (%)$Translate{'Throughput'} (B/s)$Translate{'Throughput'} ($trfunit/s)$Translate{'Cost'} $self->{Currency}
@@ -4213,7 +4219,7 @@ sub _print_user_stat - + }; print $out qq{ @@ -4426,6 +4432,9 @@ sub _print_netuser_stat $infile->close(); my $nuser = scalar keys %netuser_stat; + my $trfunit = $self->{TransfertUnit} || 'B'; + $trfunit = 'B' if ($trfunit eq 'BYTE'); + print $$out qq{

$Translate{'User_number'}: $nuser

}; @@ -4437,7 +4446,7 @@ sub _print_netuser_stat - + }; print $$out qq{ @@ -4589,6 +4598,9 @@ sub _print_user_detail } $infile->close(); + my $trfunit = $self->{TransfertUnit} || 'B'; + $trfunit = 'B' if ($trfunit eq 'BYTE'); + my $nurl = scalar keys %url_stat; print $$out qq{

$Translate{'Url_number'}: $nurl

@@ -4599,7 +4611,7 @@ sub _print_user_detail - + }; print $$out qq{ @@ -4808,6 +4820,9 @@ sub _print_top_url_stat $sortpos = 2 if ($self->{OrderUrl} eq 'bytes'); $sortpos = 3 if ($self->{OrderUrl} eq 'duration'); + my $trfunit = $self->{TransfertUnit} || 'B'; + $trfunit = 'B' if ($trfunit eq 'BYTE'); + # Print the HTML header my $cal = 'SA_CALENDAR_SA'; $cal = '' if ($week); @@ -4829,7 +4844,7 @@ sub _print_top_url_stat - + }; print $out qq{ @@ -5390,6 +5405,10 @@ $domain2_bytes } else { print $out "

$t1 $stat_date

\n"; } + + my $trfunit = $self->{TransfertUnit} || 'B'; + $trfunit = 'B' if ($trfunit eq 'BYTE'); + print $out qq{
$Translate{'Requests'} (%) $Translate{$self->{TransfertUnit}} (%) $Translate{'Duration'} (%)$Translate{'Throughput'} (B/s)$Translate{'Throughput'} ($trfunit/s)$Translate{'Cost'} $self->{Currency}$Translate{'Requests'} (%) $Translate{$self->{TransfertUnit}} (%) $Translate{'Duration'} (%)$Translate{'Throughput'} (B/s)$Translate{'Throughput'} ($trfunit/s)$Translate{'Cost'} $self->{Currency}$Translate{'Requests'} (%) $Translate{$self->{TransfertUnit}} (%) $Translate{'Duration'} (%)$Translate{'Throughput'} (B/s)$Translate{'Throughput'} ($trfunit/s) $Translate{'Last_visit'}$Translate{'Requests'} (%) $Translate{$self->{TransfertUnit}} (%) $Translate{'Duration'} (%)$Translate{'Throughput'} (B/s)$Translate{'Throughput'} ($trfunit/s) $Translate{'Last_visit'}
@@ -5398,7 +5417,7 @@ $domain2_bytes - + }; print $out qq{
$Translate{'Requests'} (%) $Translate{$self->{TransfertUnit}} (%) $Translate{'Duration'} (%)$Translate{'Throughput'} (B/s)$Translate{'Throughput'} ($trfunit/s) $Translate{'Last_visit'}