diff --git a/SquidAnalyzer.pm b/SquidAnalyzer.pm
index 0c06199..ae9710e 100644
--- a/SquidAnalyzer.pm
+++ b/SquidAnalyzer.pm
@@ -1126,9 +1126,9 @@ sub _print_header
-
+
-
+
@@ -1578,8 +1578,8 @@ sub _print_mime_stat
print $out qq{
};
}
- my $sortpos = 1;
- $sortpos = 2 if ($self->{OrderMime} eq 'bytes');
+ my $sortpos = 2;
+ $sortpos = 3 if ($self->{OrderMime} eq 'bytes');
print $out qq{
@@ -1837,9 +1837,9 @@ sub _print_network_stat
$network_stat{$net}{url}
};
- my $sortpos = 1;
- $sortpos = 2 if ($self->{OrderNetwork} eq 'bytes');
- $sortpos = 3 if ($self->{OrderNetwork} eq 'duration');
+ my $sortpos = 2;
+ $sortpos = 3 if ($self->{OrderNetwork} eq 'bytes');
+ $sortpos = 4 if ($self->{OrderNetwork} eq 'duration');
print $outnet qq{
@@ -1851,9 +1851,9 @@ sub _print_network_stat
}
print $out "\n";
- my $sortpos = 1;
- $sortpos = 2 if ($self->{OrderNetwork} eq 'bytes');
- $sortpos = 3 if ($self->{OrderNetwork} eq 'duration');
+ my $sortpos = 2;
+ $sortpos = 3 if ($self->{OrderNetwork} eq 'bytes');
+ $sortpos = 4 if ($self->{OrderNetwork} eq 'duration');
print $out qq{
@@ -2074,9 +2074,9 @@ sub _print_user_stat
$self->_print_footer(\$outusr);
$outusr->close();
}
- my $sortpos = 1;
- $sortpos = 2 if ($self->{OrderUser} eq 'bytes');
- $sortpos = 3 if ($self->{OrderUser} eq 'duration');
+ my $sortpos = 2;
+ $sortpos = 3 if ($self->{OrderUser} eq 'bytes');
+ $sortpos = 4 if ($self->{OrderUser} eq 'duration');
print $out qq{
@@ -2238,12 +2238,10 @@ sub _print_user_detail
}
}
$infile->close();
- my $nurl = scalar keys %url_stat;
+ my $nurl = scalar keys %url_stat;
print $$out qq{
$Translate{'Url_number'}: $nurl
-};
- print $$out qq{
@@ -2312,9 +2310,9 @@ sub _print_user_detail
print $$out qq{
};
}
- my $sortpos = 1;
- $sortpos = 2 if ($self->{OrderUrl} eq 'bytes');
- $sortpos = 3 if ($self->{OrderUrl} eq 'duration');
+ my $sortpos = 2;
+ $sortpos = 3 if ($self->{OrderUrl} eq 'bytes');
+ $sortpos = 4 if ($self->{OrderUrl} eq 'duration');
print $$out qq{
@@ -2375,12 +2373,12 @@ sub _print_top_url_stat
# Print the HTML header
my $cal = $self->_get_calendar($stat_date, $type, $outdir);
$self->_print_header(\$out, $self->{menu}, $cal);
+ print $out "
$Translate{'Url_number'}: $nurl
\n";
for my $tpe ('Hits', 'Bytes', 'Duration') {
my $t1 = $Translate{"Url_${tpe}_title"};
$t1 =~ s/\%d/$self->{TopNumber}/;
if ($tpe eq 'Hits') {
print $out $self->_print_title($t1, $stat_date);
- print $out "
$Translate{'Url_number'}: $nurl
\n";
} else {
print $out "
$t1 $stat_date
\n";
}
@@ -2548,13 +2546,14 @@ sub _print_top_domain_stat
# Print the HTML header
my $cal = $self->_get_calendar($stat_date, $type, $outdir);
$self->_print_header(\$out, $self->{menu}, $cal);
+ print $out "
$Translate{'Domain_number'}: $nurl
\n";
+
for my $tpe ('Hits', 'Bytes', 'Duration') {
my $t1 = $Translate{"Domain_${tpe}_title"};
$t1 =~ s/\%d/$self->{TopNumber}/;
if ($tpe eq 'Hits') {
print $out $self->_print_title($t1, $stat_date);
- print $out "
$Translate{'Domain_number'}: $nurl
\n";
my %data = ();
my $total_hits = 0;
diff --git a/resources/sorttable.js b/resources/sorttable.js
index bfdf2db..904fe9a 100644
--- a/resources/sorttable.js
+++ b/resources/sorttable.js
@@ -151,6 +151,8 @@ sorttable = {
//sorttable.shaker_sort(row_array, this.sorttable_sortfunction);
/* and comment out this one */
row_array.sort(this.sorttable_sortfunction);
+ // SquidAnalyzer: Sort in descending order first
+ row_array.reverse();
tb = this.sorttable_tbody;
for (var j=0; j