X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fvhftable.pl;h=a4a784918442b626046949196cc7914548ec5e8b;hb=a76624e4742348ed0f39c7c3f732cdec8462da9e;hp=61193a846462d329c5b3b085ee63d20ad5bc0efc;hpb=23e50709e723c7ca87939cfd86441e22a9e5a264;p=spider.git

diff --git a/cmd/show/vhftable.pl b/cmd/show/vhftable.pl
index 61193a84..a4a78491 100644
--- a/cmd/show/vhftable.pl
+++ b/cmd/show/vhftable.pl
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -12,65 +12,122 @@ my @calls;
 my $days = 31;
 my @dxcc;
 my $limit = 100;
+my $now;
+my @pref;
+my @out;
+my $date;
+my $all;
 
-push @dxcc, (61..67) if $self->dxcc >= 61 && $self->dxcc < 67;
-push @dxcc, $self->dxcc unless @dxcc;
+#$DB::single = 1;
 
-my $now = Julian::Day->new(time())->sub(1);
-my %list;
-my $i;
+while (@f) {
+	my $f = shift @f;
 
-# 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);
+	if ($f =~ /^\d+$/ && $f < 366) {		# no of days
+		$days = $f;
+		next;
 	}
-	while (<$fh>) {
-		chomp;
-		my @l = split /\^/;
-		next if $l[0] eq 'TOTALS';
-		next unless grep $l[2] eq $_, @dxcc;
-		my $ref = $list{$l[0]} || [0,0,0,0,0,0,0,0,0,0];
-		my $j = 1;
-		foreach my $item (@l[12..14, 16..22]) {
-			$ref->[$j] += $item;
-			$ref->[0] += $item;
-			$j++;
+	if (my $utime = Date::Parse::str2time($f)) {	# is it a parseable date?
+		$utime += 3600;
+		$now = Julian::Day->new($utime);
+		$date = cldate($utime);
+		next;
+	}
+	$f = uc $f;
+	if (is_callsign($f)) {
+		push @dxcc, [$f, 0];
+		push @pref, $f;
+	} else {
+		if ($f eq 'ALL' ) {
+			$all++;
+			push @pref, $f;
+			next;
+		}
+		if (my @ciz = Prefix::to_ciz('nc', $f)) {
+			push @dxcc, map {[$_, 2]} @ciz;
+			push @pref, $f;
+		} else {
+			push @out, $self->msg('e27', $f);
 		}
-		$list{$l[0]} = $ref if $ref->[0];
 	}
-	$now = $now->sub(1);
 }
 
-my @out;
-my @tot;
-my $nocalls;
+# return error messages if any
+return (1, @out) if @out;
 
-push @out, $self->msg('statvhft', join ',', @dxcc);
-push @out, sprintf "%10s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|", qw(Callsign Tot 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm);
+# default prefixes
+unless (@pref) {					# no prefix or callsign, use default prefix
+	push @dxcc, [$_, 2] for @main::my_cc;
+	push @pref, $main::mycall;
+}
 
-for (sort {$list{$b}->[0] <=> $list{$a}->[0] || $a cmp $b} keys %list) {
-	my $ref = $list{$_};
-	$nocalls++;
-	my @list = (sprintf "%10s", $_);
-	foreach my $j (0..9) {
-		my $r = $ref->[$j];
-		if ($r) {
-			$tot[$j] += $r;
-			$r = sprintf("%4d", $r);
-		} else {
-			$r = '    ';
-		}
-		push @list, $r;
-	}
-	push @out, join('|', @list, "");
-	last if $limit && $nocalls >= $limit;
+# default date
+unless ($now) {
+	$now = Julian::Day->new(time); #no starting date
+	$date = cldate(time);
 }
 
-$nocalls = sprintf "%10s", "$nocalls calls";
-@tot = map {$_ ?  sprintf("%4d", $_) : '    ' } @tot;
-push @out, join('|', $nocalls, @tot, "");
+@out = $self->spawn_cmd(sub {
+							my %list;
+							my @out;
+							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 if $l[0] eq 'TOTALS';
+									next unless $all || grep $l[$_->[1]] eq $_->[0], @dxcc;
+									my $ref = $list{$l[0]} || [0,0,0,0,0,0,0,0,0,0];
+									my $j = 1;
+									foreach my $item (@l[14..16, 18..23]) {
+										$ref->[$j] += $item;
+										$ref->[0] += $item;
+										$j++;
+									}
+									$list{$l[0]} = $ref if $ref->[0];
+								}
+								$now = $now->sub(1);
+							}
+
+							my @tot;
+							my $nocalls;
+
+							my $l = join ',', @pref;
+							push @out, $self->msg('statvhft', $l, $date, $days);
+							#push @out, $self->msg('statvhft', join(',', @dxcc), cldate(time));
+							push @out, sprintf "%10s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|", qw(Callsign Tot 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm);
+
+							for (sort {$list{$b}->[0] <=> $list{$a}->[0] || $a cmp $b} keys %list) {
+								my $ref = $list{$_};
+								$nocalls++;
+								my @list = (sprintf "%10s", $_);
+								foreach my $j (0..9) {
+									my $r = $ref->[$j];
+									if ($r) {
+										$tot[$j] += $r;
+										$r = sprintf("%4d", $r);
+									}
+									else {
+										$r = '    ';
+									}
+									push @list, $r;
+								}
+								push @out, join('|', @list, "");
+								last if $limit && $nocalls >= $limit;
+							}
+
+							$nocalls = sprintf "%10s", "$nocalls calls";
+							@tot = map {$_ ?  sprintf("%4d", $_) : '    ' } @tot;
+							push @out, join('|', $nocalls, @tot, "");
+
+							return @out;
+						});
 
 return (1, @out);