X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fvhfstats.pl;h=26970f6a127d1e8c325e4e89e9af8ecce7be6606;hb=refs%2Fheads%2Fnewpc92timings;hp=cba3fb8386b1e79878271dfdf1681129eef94156;hpb=70ffd373d199a2a83072da4e2b75572a2270383f;p=spider.git

diff --git a/cmd/show/vhfstats.pl b/cmd/show/vhfstats.pl
index cba3fb83..26970f6a 100644
--- a/cmd/show/vhfstats.pl
+++ b/cmd/show/vhfstats.pl
@@ -3,15 +3,38 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
 my $days = 31;
-my $now = Julian::Day->new(time())->sub(31);
 my $i;
 my @in;
+my $now;
+my $date = cldate($main::systime);
+my $utime = $main::systime;
+my @out;
+
+while (@f) {
+	my $f = shift @f;
+
+	if ($f =~ /^\d+$/ && $f < 366) {		# no of days
+		$days = $f;
+		next;
+	}
+	if (my $ut = Date::Parse::str2time($f)) {	# is it a parseable date?
+		$utime = $ut+3600;
+		next;
+	}
+	push @out, $self->msg('e33', $f);
+}
+
+return (1, @out) if @out;
+
+$now = Julian::Day->new($utime);
+$now = $now->sub($days);
+$date = cldate($utime);
 
 # generate the spot list
 for ($i = 0; $i < $days; $i++) {
@@ -32,20 +55,19 @@ for ($i = 0; $i < $days; $i++) {
 	$now = $now->add(1);
 }
 
-my @out;
 my @tot;
 
-push @out, $self->msg('statvhf');
-push @out, sprintf "%11s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Callsign Total 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm);
+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 (12..14,16..21) {
+	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[12..14,16..21]) . '|';
+	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[12..14,16..21]) . '|';
+push @out, join('|', sprintf("%11s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[14..16,18..23]) . '|';
 
 return (1, @out);