X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fhftable.pl;fp=cmd%2Fshow%2Fhftable.pl;h=4ad679d2bd59cc995c992e76fcd322ab912298bb;hb=f2c90f82509ae2be33216ebaed3bc9f8ea3f5f80;hp=40f8d2ca93f7580aa644bb6b967edd1340c4cb83;hpb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;p=spider.git

diff --git a/cmd/show/hftable.pl b/cmd/show/hftable.pl
index 40f8d2ca..4ad679d2 100644
--- a/cmd/show/hftable.pl
+++ b/cmd/show/hftable.pl
@@ -1,4 +1,4 @@
-#
+ #
 # do an HFSpot table 
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
@@ -34,126 +34,144 @@
 # 20021124
 #
 
-my ($self, $line) = @_;
-my @f = split /\s+/, $line;
-my @calls;
-my $days = 31;
-my @dxcc;
-my $limit = 100;
-my $now;
-my @pref;
-my @out;
-my $date;
-my $all;
+ my @calls;
+ my $days = 31;
+ my @dxcc;
+ my $limit = 100;
+ my $now;
+ my @pref;
+ my $date;
+ my $all;
 
-#$DB::single = 1;
+ sub handle
+ {
+	 my ($self, $line) = @_;
 
-while (@f) {
-	my $f = shift @f;
+	 my @out;
 
-	if ($f =~ /^\d+$/ && $f < 366) {		# no of days
-		$days = $f;
-		next;
-	}
-	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);
-		}
-	}
-}
+	 my @f = split /\s+/, $line;
 
-# return error messages if any
-return (1, @out) if @out;
+	 #$DB::single = 1;
 
-# default prefixes
-unless (@pref) {					# no prefix or callsign, use default prefix
-	push @dxcc, [$_, 2] for @main::my_cc;
-	push @pref, $main::mycall;
-}
+	 while (@f) {
+		 my $f = shift @f;
 
-# default date
-unless ($now) {
-	$now = Julian::Day->new(time); #no starting date
-	$date = cldate(time);
-}
+		 if ($f =~ /^\d+$/ && $f < 366) { # no of days
+			 $days = $f;
+			 next;
+		 }
+		 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);
+			 }
+		 }
+	 }
 
-@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;
-							}
+	 # return error messages if any
+	 return (1, @out) if @out;
 
-							$nocalls = sprintf "%9s", "$nocalls calls";
-							@tot = map {$_ ?  sprintf("%5d", $_) : '     ' } @tot;
-							push @out, join('|', $nocalls, @tot,"");
-							return @out;
-						});
+	 # default prefixes
+	 unless (@pref) {	   # no prefix or callsign, use default prefix
+		 push @dxcc, [$_, 2] for @main::my_cc;
+		 push @pref, $main::mycall;
+	 }
 
+	 # default date
+	 unless ($now) {
+		 $now = Julian::Day->new(time); #no starting date
+		 $date = cldate(time);
+	 }
 
-return (1, @out);
+
+	 if ($self->{_nospawn}) {
+		 @out = generate($self);
+	 } else {
+		 @out = $self->spawn_cmd("show/hftable $line", sub { return (generate($self)); });
+	 }
+
+	 return (1, @out);
+ }
+
+sub generate
+ {
+	 my $self = shift;
+	 
+	my @out;
+	my %list;
+	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;
+	}
+	
+	$nocalls = sprintf "%9s", "$nocalls calls";
+	@tot = map {$_ ?  sprintf("%5d", $_) : '     ' } @tot;
+	push @out, join('|', $nocalls, @tot,"");
+	return @out;
+}