X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fhftable.pl;h=40f8d2ca93f7580aa644bb6b967edd1340c4cb83;hb=043ec29d2c3f7d807f02660417696f0e93e20880;hp=71d186337da54448fa0ee181c5614b94beb2b69e;hpb=5bc87856bb191e42d91628a5a4d9579a242b9541;p=spider.git

diff --git a/cmd/show/hftable.pl b/cmd/show/hftable.pl
index 71d18633..40f8d2ca 100644
--- a/cmd/show/hftable.pl
+++ b/cmd/show/hftable.pl
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 # Modified on 2002/10/27 by K1XX for his own use
 # Valid inputs (and then tarted up by G1TLH to include in the
@@ -40,8 +40,6 @@ my @calls;
 my $days = 31;
 my @dxcc;
 my $limit = 100;
-my %list;
-my $i;
 my $now;
 my @pref;
 my @out;
@@ -87,13 +85,8 @@ return (1, @out) if @out;
 
 # default prefixes
 unless (@pref) {					# no prefix or callsign, use default prefix
-	if ($self->dxcc >= 61 && $self->dxcc < 67) {
-		push @dxcc, [$_, 2] for (61..67);
-		push @pref, "GB";
-	} else {
-		push @dxcc, [$self->dxcc, 2];
-		push @pref, $self->call;
-	}
+	push @dxcc, [$_, 2] for @main::my_cc;
+	push @pref, $main::mycall;
 }
 
 # default date
@@ -102,57 +95,65 @@ unless ($now) {
 	$date = cldate(time);
 }
 
-# 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[4..13]) {
-			$ref->[$j] += $item;
-			$ref->[0] += $item;
-			$j++;
-		}
-		$list{$l[0]} = $ref if $ref->[0];
-	}
-	$now = $now->sub(1);
-}
+@out = $self->spawn_cmd("show/hftable $line", 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[4..13]) {
+										$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('stathft', $l, $date, $days);
+							push @out, sprintf "%9s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Callsign Tot 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m);
+							
+							for (sort {$list{$b}->[0] <=> $list{$a}->[0] || $a cmp $b} keys %list) {
+								my $ref = $list{$_};
+								$nocalls++;
+								my @list = (sprintf "%9s", $_);
+								foreach my $j (0..11) {
+									my $r = $ref->[$j];
+									if ($r) {
+										$tot[$j] += $r;
+										$r = sprintf("%5d", $r);
+									} else {
+										$r = '     ';
+									}
+									push @list, $r;
+								}
+								push @out, join('|', @list);
+								last if $limit && $nocalls >= $limit;
+							}
 
-my @tot;
-my $nocalls;
-
-my $l = join ',', @pref;
-push @out, $self->msg('stathft', $l, $date, $days);
-push @out, sprintf "%9s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Callsign Tot 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m);
-
-for (sort {$list{$b}->[0] <=> $list{$a}->[0] || $a cmp $b} keys %list) {
-	my $ref = $list{$_};
-	$nocalls++;
-	my @list = (sprintf "%9s", $_);
-	foreach my $j (0..11) {
-		my $r = $ref->[$j];
-		if ($r) {
-			$tot[$j] += $r;
-			$r = sprintf("%5d", $r);
-		} else {
-			$r = '     ';
-		}
-		push @list, $r;
-	}
-	push @out, join('|', @list);
-	last if $limit && $nocalls >= $limit;
-}
+							$nocalls = sprintf "%9s", "$nocalls calls";
+							@tot = map {$_ ?  sprintf("%5d", $_) : '     ' } @tot;
+							push @out, join('|', $nocalls, @tot,"");
+							return @out;
+						});
 
-$nocalls = sprintf "%9s", "$nocalls calls";
-@tot = map {$_ ?  sprintf("%5d", $_) : '     ' } @tot;
-push @out, join('|', $nocalls, @tot,"");
 
 return (1, @out);