From: minima Date: Thu, 5 Dec 2002 18:32:11 +0000 (+0000) Subject: added k1xx's changes to spot stats routines X-Git-Tag: PRE-1-52~103 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5bc87856bb191e42d91628a5a4d9579a242b9541;p=spider.git added k1xx's changes to spot stats routines --- diff --git a/Changes b/Changes index 15c02b33..8a4971f7 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,11 @@ +05Dec02======================================================================= +1. Fix SSID issues with AGWMsg. +2. updated show/hftable, vhftable, hfstats, vhfstats and dxstats after K1XX +sent in some sample code indicated new functionality he requires. Translators +please note that the stat* messages have been changed and e33 added. I have +also added quite a bit of extra examples and things to the relevant HELP +texts. It is now possible to search from any date for up to 365 days of data. +You can get the information by prefix or by callsign or for ALL spots. 04Dec02======================================================================= 1. updated sh/log to allow searching for more arbitrary strings such as IP addresses diff --git a/cmd/show/dxstats.pl b/cmd/show/dxstats.pl index 0b60e7a4..9924a903 100644 --- a/cmd/show/dxstats.pl +++ b/cmd/show/dxstats.pl @@ -11,11 +11,34 @@ my @f = split /\s+/, $line; my @calls; my $days = 31; my @dxcc; - -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++) { my $fh = $Spot::statp->open($now); # get the next file @@ -35,10 +58,9 @@ for ($i = 0; $i < $days; $i++) { $now = $now->add(1); } -my @out; my $tot; -push @out, $self->msg('statdx'); +push @out, $self->msg('statdx', $date, $days); foreach my $ref (@in) { push @out, sprintf "%12s: %7d", $ref->[0]->as_string, $ref->[1]; $tot += $ref->[1]; diff --git a/cmd/show/hfstats.pl b/cmd/show/hfstats.pl index 547882d1..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 +# +# 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,10 +74,9 @@ for ($i = 0; $i < $days; $i++) { $now = $now->add(1); } -my @out; my @tot; -push @out, $self->msg('stathf', cldate(time)); +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; diff --git a/cmd/show/hftable.pl b/cmd/show/hftable.pl index c7fee473..71d18633 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 [] [] [prefix] [prefix] [prefix] .. +# +# sh/hftable [] [] (data from your own prefix) +# +# sh/hftable [] [] [callsign] [callsign] [callsign] .. +# +# sh/hftable [] [] 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,67 @@ my @calls; my $days = 31; my @dxcc; my $limit = 100; +my %list; +my $i; +my $now; +my @pref; +my @out; +my $date; +my $all; -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; +#$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); + } + } } -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 + if ($self->dxcc >= 61 && $self->dxcc < 67) { + push @dxcc, [$_, 2] for (61..67); + push @pref, "GB"; + } else { + push @dxcc, [$self->dxcc, 2]; + push @pref, $self->call; + } +} + +# 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 +113,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 +126,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 +151,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); diff --git a/cmd/show/vhfstats.pl b/cmd/show/vhfstats.pl index b3584b59..121a5ff6 100644 --- a/cmd/show/vhfstats.pl +++ b/cmd/show/vhfstats.pl @@ -9,9 +9,32 @@ 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,10 +55,9 @@ for ($i = 0; $i < $days; $i++) { $now = $now->add(1); } -my @out; my @tot; -push @out, $self->msg('statvhf', cldate(time)); +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; diff --git a/cmd/show/vhftable.pl b/cmd/show/vhftable.pl index d41838f6..421443a6 100644 --- a/cmd/show/vhftable.pl +++ b/cmd/show/vhftable.pl @@ -12,19 +12,67 @@ 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 + if ($self->dxcc >= 61 && $self->dxcc < 67) { + push @dxcc, [$_, 2] for (61..67); + push @pref, "GB"; + } else { + push @dxcc, [$self->dxcc, 2]; + push @pref, $self->call; + } +} + +# 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 +85,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[14..16, 18..23]) { @@ -50,11 +98,12 @@ for ($i = 0; $i < $days; $i++) { $now = $now->sub(1); } -my @out; my @tot; my $nocalls; -push @out, $self->msg('statvhft', join(',', @dxcc), cldate(time)); +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) { diff --git a/perl/AGWMsg.pm b/perl/AGWMsg.pm index d6828812..f6fc5074 100644 --- a/perl/AGWMsg.pm +++ b/perl/AGWMsg.pm @@ -327,15 +327,9 @@ sub _decode $conn->{incoming} = 1; $conn->{agwcall} = $call; $circuit{$call} = $conn; - if ($call =~ /^(\w+)-(\d\d?)$/) { - my $c = $1; - my $s = $2; - $s = 15 - $s; - if ($s <= 8 && $s > 0) { - $call = "${c}-${s}"; - } else { - $call = $c; - } + if (my ($c, $s) = $call =~ /^(\w+)-(\d\d?)$/) { + $s = 15 - $s if $s > 8; + $call = $s > 0 ? "${c}-${s}" : $c; } $conn->to_connected($call, 'A', $conn->{csort} = 'ax25'); } diff --git a/perl/Messages b/perl/Messages index 02e44020..149cd00f 100644 --- a/perl/Messages +++ b/perl/Messages @@ -86,6 +86,7 @@ package DXM; e30 => 'Cannot Open $_[0] $!', e31 => '$_[0] is not a user', e32 => 'Need a passphrase', + e33 => '$_[0] is not a number of days or a valid date', echoon => 'Echoing enabled', echooff => 'Echoing disabled', @@ -256,11 +257,11 @@ package DXM; sqra => 'Cluster QRA Locator$_[0], DON\'T FORGET TO CHANGE YOUR DXVars.pm', sorry => 'Sorry', spf1 => 'spoof: creating new user $_[0]', - stathf => 'HF DX Spot Stats, last 31 days from $_[0]', - stathft => 'HF DX Spot Stats, last 31 days from $_[1] for DXCC $_[0]', - statvhf => 'VHF+ DX Spot Stats, last 31 days from $_[0]', - statvhft => 'VHF+ DX Spot Stats, last 31 days from $_[1] for DXCC $_[0]', - statdx => 'Total DX Spots last 31 days', + stathf => 'HF DX Spot Stats, last $_[1] days from $_[0]', + stathft => 'HF DX Spot Stats, last $_[2] days from $_[1] for DXCC $_[0]', + statvhf => 'VHF+ DX Spot Stats, last $_[1] days from $_[0]', + statvhft => 'VHF+ DX Spot Stats, last $_[2] days from $_[1] for DXCC $_[0]', + statdx => 'Total DX Spots for $_[1] days from $_[0]', sun => 'Location dd/mm/yyyy Rise Set', sun_with_azel => 'Location dd/mm/yyyy Rise Set Azim Elev', susdb1 => 'usage: callsign state city', diff --git a/perl/Spot.pm b/perl/Spot.pm index 9f5c8645..8674e111 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -369,6 +369,7 @@ sub genstats($) my ($freq, $by, $dxcc) = (split /\^/)[0,4,6]; my $ref = $list{$by} || [0, $dxcc]; for (@freq) { + next unless defined $_; if ($freq >= $_->[1] && $freq <= $_->[2]) { $$ref[$_->[0]+2]++; $tot[$_->[0]+2]++;