X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fhfstats.pl;h=2072e7e03adeec430080d7dd621c560f4dc7b319;hb=da65011693cc9a7a33f09424f7a19a51937d986c;hp=63a3b56c1eaa0532f92d7f7db3dfecbcdd5bc297;hpb=70ffd373d199a2a83072da4e2b75572a2270383f;p=spider.git

diff --git a/cmd/show/hfstats.pl b/cmd/show/hfstats.pl
index 63a3b56c..2072e7e0 100644
--- a/cmd/show/hfstats.pl
+++ b/cmd/show/hfstats.pl
@@ -5,13 +5,55 @@
 #
 # $Id$
 #
+# 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
+#
+
+use Date::Parse;
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
 my $days = 31;
-my $now = Julian::Day->new(time())->sub(31);
 my $i;
 my @in;
+my $now;
+my $date = cldate($main::systime);
+my $utime = $main::systime;
+my @out;
+
+while (@f) {
+	my $f = shift @f;
+
+	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;
+	}
+	push @out, $self->msg('e33', $f);
+}
+
+return (1, @out) if @out;
+
+$now = Julian::Day->new($utime);
+$now = $now->sub($days);
+$date = cldate($utime);
 
 # generate the spot list
 for ($i = 0; $i < $days; $i++) {
@@ -32,20 +74,21 @@ for ($i = 0; $i < $days; $i++) {
 	$now = $now->add(1);
 }
 
-my @out;
 my @tot;
 
-push @out, $self->msg('stathf');
-push @out, sprintf "%11s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 160m 80m 40m 30m 20m 17m 15m 12m 10m);
+push @out, $self->msg('stathf', $date, $days);
+push @out, sprintf "%6s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m);
 foreach my $ref (@in) {
 	my $linetot = 0;
-	foreach my $j (3..11) {
+	foreach my $j (4..13) {
 		$tot[$j] += $ref->[$j];
 		$tot[0] += $ref->[$j];
 		$linetot += $ref->[$j];
 	}
-	push @out, join '|', sprintf("%11s|%6d", $ref->[0]->as_string, $linetot), map {$_ ? sprintf("%5d", $_) : '     '} @$ref[3..11], "";
+	my $date = $ref->[0]->as_string;
+	$date =~ s/-\d+$//;
+	push @out, join '|', sprintf("%6s|%6d", $date, $linetot), map {$_ ? sprintf("%5d", $_) : '     '} @$ref[4..13], "";
 }
-push @out, join '|', sprintf("%11s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[3..11], "";
+push @out, join '|', sprintf("%6s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[4..13], "";
 
 return (1, @out);