X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fvhfstats.pl;h=b819ab7ca29fdfd212695f7ceeb539d377a59249;hb=601ea9fb47810209aeedef1a3041df5a916964f3;hp=26970f6a127d1e8c325e4e89e9af8ecce7be6606;hpb=c3505bcfc922cd712bad2c20b3479cf8d1dc54fe;p=spider.git diff --git a/cmd/show/vhfstats.pl b/cmd/show/vhfstats.pl index 26970f6a..b819ab7c 100644 --- a/cmd/show/vhfstats.pl +++ b/cmd/show/vhfstats.pl @@ -9,8 +9,6 @@ my ($self, $line) = @_; my @f = split /\s+/, $line; my $days = 31; -my $i; -my @in; my $now; my $date = cldate($main::systime); my $utime = $main::systime; @@ -36,38 +34,46 @@ $now = Julian::Day->new($utime); $now = $now->sub($days); $date = cldate($utime); +@out = $self->spawn_cmd("show/vhfstats $line", sub { + my %list; + my @out; + my @in; + my $i; + # generate the spot list -for ($i = 0; $i < $days; $i++) { - my $fh = $Spot::statp->open($now); # get the next file - unless ($fh) { - Spot::genstats($now); - $fh = $Spot::statp->open($now); - } - while (<$fh>) { - chomp; - my @l = split /\^/; - next unless $l[0] eq 'TOTALS'; - next unless $l[1]; - $l[0] = $now; - push @in, \@l; - last; - } - $now = $now->add(1); -} + for ($i = 0; $i < $days; $i++) { + my $fh = $Spot::statp->open($now); # get the next file + unless ($fh) { + Spot::genstats($now); + $fh = $Spot::statp->open($now); + } + while (<$fh>) { + chomp; + my @l = split /\^/; + next unless $l[0] eq 'TOTALS'; + next unless $l[1]; + $l[0] = $now; + push @in, \@l; + last; + } + $now = $now->add(1); + } -my @tot; + my @tot; -push @out, $self->msg('statvhf', $date, $days); -push @out, sprintf "%11s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm); -foreach my $ref (@in) { - my $linetot = 0; - foreach my $j (14..16,18..23) { - $tot[$j] += $ref->[$j]; - $tot[0] += $ref->[$j]; - $linetot += $ref->[$j]; - } - push @out, join('|', sprintf("%11s|%6d", $ref->[0]->as_string, $linetot), map {$_ ? sprintf("%5d", $_) : ' '} @$ref[14..16,18..23]) . '|'; -} -push @out, join('|', sprintf("%11s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : ' '} @tot[14..16,18..23]) . '|'; + push @out, $self->msg('statvhf', $date, $days); + push @out, sprintf "%11s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm); + foreach my $ref (@in) { + my $linetot = 0; + foreach my $j (14..16,18..23) { + $tot[$j] += $ref->[$j]; + $tot[0] += $ref->[$j]; + $linetot += $ref->[$j]; + } + push @out, join('|', sprintf("%11s|%6d", $ref->[0]->as_string, $linetot), map {$_ ? sprintf("%5d", $_) : ' '} @$ref[14..16,18..23]) . '|'; + } + push @out, join('|', sprintf("%11s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : ' '} @tot[14..16,18..23]) . '|'; + return @out; + }); return (1, @out);