X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fhftable.pl;h=4bcd3d19522da2e6f827a17253924709797dfcb8;hb=fd0973e8351e0fc5e762034da5fa02e2a715b6dd;hp=c7fee473f02c897eecc4dab939f08b236f6931ac;hpb=5b9ab81174d4a7734c92af52da6ddf89e980e321;p=spider.git

diff --git a/cmd/show/hftable.pl b/cmd/show/hftable.pl
index c7fee473..4bcd3d19 100644
--- a/cmd/show/hftable.pl
+++ b/cmd/show/hftable.pl
@@ -5,6 +5,34 @@
 #
 # $Id$
 #
+# Modified on 2002/10/27 by K1XX for his own use
+# Valid inputs (and then tarted up by G1TLH to include in the
+# main distribution):
+#
+# sh/hftable (original operation, starts from today for own prefix)
+#
+# sh/hftable [<date>] [<no. of days>] [prefix] [prefix] [prefix] ..
+#
+# sh/hftable [<date>] [<no. of days>]  (data from your own prefix)
+# 
+# sh/hftable [<date>] [<no. of days>] [callsign] [callsign] [callsign] ..
+#
+# sh/hftable [<date>] [<no of days>] all
+#  
+#
+# Known good data formats
+# dd-mmm-yy
+# 24-Nov-02 (using - . or / as separator)
+# 24nov02 (ie no separators)
+# 24nov2002
+#
+# mm-dd-yy (this depends on your locale settings)
+# 11-24-02 (using - . or / as separator) 
+#
+# yymmdd
+# 021124
+# 20021124
+#
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
@@ -12,19 +40,62 @@ my @calls;
 my $days = 31;
 my @dxcc;
 my $limit = 100;
+my %list;
+my $i;
+my $now;
+my @pref;
+my @out;
+my $date;
+my $all;
+
+#$DB::single = 1;
+
+while (@f) {
+	my $f = shift @f;
 
-if ($line) {
-	my @pref = split /[\s,]+/, $line;
-	push @dxcc, Prefix::to_ciz('nc', @pref);
-	return (1, $self->msg('e27', $line)) unless @dxcc;
-} else {
-	push @dxcc, (61..67) if $self->dxcc >= 61 && $self->dxcc < 67;
-	push @dxcc, $self->dxcc unless @dxcc;
+	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 $now = Julian::Day->new(time())->sub(1);
-my %list;
-my $i;
+# 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++) {
@@ -37,7 +108,7 @@ 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[4..13]) {
@@ -50,24 +121,24 @@ for ($i = 0; $i < $days; $i++) {
 	$now = $now->sub(1);
 }
 
-my @out;
 my @tot;
 my $nocalls;
 
-push @out, $self->msg('stathft', join(',', @dxcc), cldate(time));
-push @out, sprintf "%10s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s", qw(Callsign Tot 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m);
+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 "%10s", $_);
+	my @list = (sprintf "%9s", $_);
 	foreach my $j (0..11) {
 		my $r = $ref->[$j];
 		if ($r) {
 			$tot[$j] += $r;
-			$r = sprintf("%4d", $r);
+			$r = sprintf("%5d", $r);
 		} else {
-			$r = '    ';
+			$r = '     ';
 		}
 		push @list, $r;
 	}
@@ -75,8 +146,8 @@ for (sort {$list{$b}->[0] <=> $list{$a}->[0] || $a cmp $b} keys %list) {
 	last if $limit && $nocalls >= $limit;
 }
 
-$nocalls = sprintf "%10s", "$nocalls calls";
-@tot = map {$_ ?  sprintf("%4d", $_) : '    ' } @tot;
-push @out, join('|', $nocalls, @tot, "");
+$nocalls = sprintf "%9s", "$nocalls calls";
+@tot = map {$_ ?  sprintf("%5d", $_) : '     ' } @tot;
+push @out, join('|', $nocalls, @tot,"");
 
 return (1, @out);