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

diff --git a/cmd/show/vhftable.pl b/cmd/show/vhftable.pl
index 61193a84..9df5e4a7 100644
--- a/cmd/show/vhftable.pl
+++ b/cmd/show/vhftable.pl
@@ -12,13 +12,62 @@ my @calls;
 my $days = 31;
 my @dxcc;
 my $limit = 100;
-
-push @dxcc, (61..67) if $self->dxcc >= 61 && $self->dxcc < 67;
-push @dxcc, $self->dxcc unless @dxcc;
-
-my $now = Julian::Day->new(time())->sub(1);
 my %list;
 my $i;
+my $now;
+my @pref;
+my @out;
+my $date;
+my $all;
+
+#$DB::single = 1;
+
+while (@f) {
+	my $f = shift @f;
+
+	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);
+		}
+	}
+}
+
+# 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 date
+unless ($now) {
+	$now = Julian::Day->new(time); #no starting date
+	$date = cldate(time);
+}
 
 # generate the spot list
 for ($i = 0; $i < $days; $i++) {
@@ -31,10 +80,10 @@ for ($i = 0; $i < $days; $i++) {
 		chomp;
 		my @l = split /\^/;
 		next if $l[0] eq 'TOTALS';
-		next unless grep $l[2] eq $_, @dxcc;
+		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[12..14, 16..22]) {
+		foreach my $item (@l[14..16, 18..23]) {
 			$ref->[$j] += $item;
 			$ref->[0] += $item;
 			$j++;
@@ -44,11 +93,12 @@ for ($i = 0; $i < $days; $i++) {
 	$now = $now->sub(1);
 }
 
-my @out;
 my @tot;
 my $nocalls;
 
-push @out, $self->msg('statvhft', join ',', @dxcc);
+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) {