X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fvhfstats.pl;h=22001a639ee8f85434112ae71cc64cefe0a59055;hb=681ed7b3c6d79228a68054489058b619f62974bf;hp=26970f6a127d1e8c325e4e89e9af8ecce7be6606;hpb=c3505bcfc922cd712bad2c20b3479cf8d1dc54fe;p=spider.git

diff --git a/cmd/show/vhfstats.pl b/cmd/show/vhfstats.pl
index 26970f6a..22001a63 100644
--- a/cmd/show/vhfstats.pl
+++ b/cmd/show/vhfstats.pl
@@ -1,73 +1,116 @@
 #
-# Show total VHF DX Spot Stats per day
+# Show total HF DX Spot Stats per day
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
 #
 #
+# Modified on 2002/10/29 by K1XX for his own use
+# Valid inputs:
+#
+# sh/hfstats
+#
+# sh/hfstats <date> <no. of days>
+#
+# Known good data formats
+# dd-mmm-yy
+# 24-Nov-02 (using - . or / as separator)
+#
+# mm-dd-yy
+# 11/24/02 (using - . or / as separator)
+#
+# yymmdd
+# 021124
+#
 
-my ($self, $line) = @_;
-my @f = split /\s+/, $line;
-my $days = 31;
-my $i;
-my @in;
-my $now;
-my $date = cldate($main::systime);
-my $utime = $main::systime;
-my @out;
+use Date::Parse;
 
-while (@f) {
-	my $f = shift @f;
+sub handle
+{
 
-	if ($f =~ /^\d+$/ && $f < 366) {		# no of days
-		$days = $f;
-		next;
-	}
-	if (my $ut = Date::Parse::str2time($f)) {	# is it a parseable date?
-		$utime = $ut+3600;
-		next;
+	my ($self, $line) = @_;
+	my @f = split /\s+/, $line;
+	my @out;
+	my $days = 31;
+
+	my $utime = $main::systime;
+
+	while (@f) {
+		my $f = shift @f;
+
+		if ($f =~ /^\d+$/ && $f < 366) { # no of days
+			$days = $f;
+			next;
+		} elsif (my $ut = Date::Parse::str2time($f)) { # is it a parseable date?
+			$utime = $ut+3600;
+			next;
+		}
+		push @out, $self->msg('e33', $f);
 	}
-	push @out, $self->msg('e33', $f);
-}
 
-return (1, @out) if @out;
+	return (1, @out) if @out;
+
+	my $now = Julian::Day->new($utime);
+	$now = $now->sub($days);
+	my $today = cldate($utime);
 
-$now = Julian::Day->new($utime);
-$now = $now->sub($days);
-$date = cldate($utime);
+#	@out = $self->spawn_cmd("show/vhfstats $line", sub {
+#							});
 
-# 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);
+	if ($self->{_nospawn}) {
+		return (1, generate($self, $days, $now, $today));
 	}
-	while (<$fh>) {
-		chomp;
-		my @l = split /\^/;
-		next unless $l[0] eq 'TOTALS';
-		next unless $l[1];
-		$l[0] = $now; 
-		push @in, \@l; 
-		last;
+	else {
+		return (1, $self->spawn_cmd("show/vhfstats $line", sub { (generate($self, $days, $now, $today )); }));
 	}
-	$now = $now->add(1);
 }
 
-my @tot;
 
-push @out, $self->msg('statvhf', $date, $days);
-push @out, sprintf "%11s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm);
-foreach my $ref (@in) {
-	my $linetot = 0;
-	foreach my $j (14..16,18..23) {
-		$tot[$j] += $ref->[$j];
-		$tot[0] += $ref->[$j];
-		$linetot += $ref->[$j];
+sub generate
+{
+	my ($self, $days, $now, $today) = @_;
+	
+	my %list;
+	my @out;
+	my @in;
+	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 unless $l[0] eq 'TOTALS';
+			next unless $l[1];
+			$l[0] = $now; 
+			push @in, \@l; 
+			last;
+		}
+		$now = $now->add(1);
 	}
-	push @out, join('|', sprintf("%11s|%6d", $ref->[0]->as_string, $linetot), map {$_ ? sprintf("%5d", $_) : '     '} @$ref[14..16,18..23]) . '|';
-}
-push @out, join('|', sprintf("%11s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[14..16,18..23]) . '|';
+							
+	my @tot;
+							
+	push @out, $self->msg('statvhf', $today, $days);
+	push @out, sprintf "%6s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm 12mm);
+	foreach my $ref (@in) {
+		my $linetot = 0;
+		# leaving out 220Mhz
+		my @bands = (14..16,18..24);
+		foreach my $j (14..16,18..24) {
+			$tot[$j] += $ref->[$j];
+			$tot[0] += $ref->[$j];
+			$linetot += $ref->[$j];
+		}
+		my $today = $ref->[0]->as_string;
+		$today =~ s/-\d+$//;
+		push @out, join '|', sprintf("%6s|%6d", $today, $linetot), map {$_ ? sprintf("%5d", $_) : '     '} @$ref[14..16,18..24], "";
+	}
+	push @out, join '|', sprintf("%6s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[14..16,18..24], "";
+	return @out
 
-return (1, @out);
+}