X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fvhftable.pl;h=38c584a8498bbc4eaf6cc3fcebaa1e5e41203bab;hb=f2c90f82509ae2be33216ebaed3bc9f8ea3f5f80;hp=e7770e5c4c48286b96489b665d1682cd81e09bea;hpb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;p=spider.git

diff --git a/cmd/show/vhftable.pl b/cmd/show/vhftable.pl
index e7770e5c..38c584a8 100644
--- a/cmd/show/vhftable.pl
+++ b/cmd/show/vhftable.pl
@@ -6,8 +6,6 @@
 #
 #
 
-my ($self, $line) = @_;
-my @f = split /\s+/, $line;
 my @calls;
 my $days = 31;
 my @dxcc;
@@ -18,116 +16,133 @@ my @out;
 my $date;
 my $all;
 
-#$DB::single = 1;
+sub handle
+{
+	my ($self, $line) = @_;
+	my @f = split /\s+/, $line;
 
-while (@f) {
-	my $f = shift @f;
+	#$DB::single = 1;
 
-	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;
+	while (@f) {
+		my $f = shift @f;
+
+		if ($f =~ /^\d+$/ && $f < 366) { # no of days
+			$days = $f;
 			next;
 		}
-		if (my @ciz = Prefix::to_ciz('nc', $f)) {
-			push @dxcc, map {[$_, 2]} @ciz;
+		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 {
-			push @out, $self->msg('e27', $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);
+			}
 		}
 	}
-}
 
-# return error messages if any
-return (1, @out) if @out;
+	# return error messages if any
+	return (1, @out) if @out;
 
-# default prefixes
-unless (@pref) {					# no prefix or callsign, use default prefix
-	push @dxcc, [$_, 2] for @main::my_cc;
-	push @pref, $main::mycall;
-}
+	# 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);
+	}
+	if ($self->{_nospawn}) {
+		@out = generate($self);
+	}
+	else {
+		@out = $self->spawn_cmd("show/vhftable $line", sub {return (generate($self))});
+	}
 
-# default date
-unless ($now) {
-	$now = Julian::Day->new(time); #no starting date
-	$date = cldate(time);
+	return (1, @out);
 }
 
-@out = $self->spawn_cmd("show/vhftable $line", sub {
-							my %list;
-							my @out;
-							my $i;
+sub generate
+{
+	my $self = shift;
+	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);
+	# 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;
+
+}