use Data::Dumper;
use strict;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
use vars qw($date $sfi $k $expk $a $r $sa $gmf $au @allowed @denied $fp $node $from
$dirprefix $param
- $duplth $dupage);
+ $duplth $dupage $filterdef);
$fp = 0; # the DXLog fcb
$date = 0; # the unix time of the WWV (notional)
$au = 'no'; # aurora warning
$node = ""; # originating node
$from = ""; # who this came from
-@allowed = (); # if present only these callsigns are regarded as valid WWV updators
+@allowed = qw(DK0WCY); # if present only these callsigns are regarded as valid WWV updators
@denied = (); # if present ignore any wwv from these callsigns
$duplth = 20; # the length of text to use in the deduping
$dupage = 12*3600; # the length of time to hold spot dups
$dirprefix = "$main::data/wcy";
$param = "$dirprefix/param";
+$filterdef = bless ([
+ # tag, sort, field, priv, special parser
+ ['by', 'c', 11],
+ ['origin', 'c', 12],
+ ['channel', 'c', 13],
+ ['by_dxcc', 'nc', 14],
+ ['by_itu', 'ni', 15],
+ ['by_zone', 'nz', 16],
+ ['origin_dxcc', 'nc', 17],
+ ['origin_itu', 'ni', 18],
+ ['origin_zone', 'nz', 19],
+ ], 'Filter::Cmd');
+
+
sub init
{
$fp = DXLog::new('wcy', 'dat', 'm');
sub update
{
my ($mydate, $mytime, $mysfi, $mya, $myk, $myexpk, $myr, $mysa, $mygmf, $myau, $myfrom, $mynode) = @_;
- if ((@allowed && grep {$_ eq $from} @allowed) ||
- (@denied && !grep {$_ eq $from} @denied) ||
+ $myfrom =~ s/-\d+$//;
+ if ((@allowed && grep {$_ eq $myfrom} @allowed) ||
+ (@denied && !grep {$_ eq $myfrom} @denied) ||
(@allowed == 0 && @denied == 0)) {
# my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
{
my $from = shift;
my $to = shift;
- my @date = $fp->unixtoj(shift);
+ my $date = $fp->unixtoj(shift);
my $pattern = shift;
my $search;
my @out;
my $eval;
my $count;
+ my $i;
$search = 1;
$eval = qq(
);
$fp->close; # close any open files
-
- my $fh = $fp->open(@date);
- for ($count = 0; $count < $to; ) {
+ my $fh = $fp->open($date);
+ for ($i = $count = 0; $count < $to; $i++ ) {
my @in = ();
if ($fh) {
while (<$fh>) {
my $d = cldate($r->[0]);
my $t = (gmtime($r->[0]))[2];
- return sprintf("$d %02d %5d %3d %3d %3d %3d %-5s %-5s %6s <%s>",
+ return sprintf("$d %02d %5d %3d %3d %3d %3d %-5s %-5s %6s <%s>",
$t, @$r[1..9]);
}
#
sub readfile
{
- my @date = $fp->unixtoj(shift);
- my $fh = $fp->open(@date);
+ my $date = $fp->unixtoj(shift);
+ my $fh = $fp->open($date);
my @spots = ();
my @in;
# enter the spot for dup checking and return true if it is already a dup
sub dup
{
- my ($d, $sfi, $a, $k, $r) = @_;
+ my ($d) = @_;
# dump if too old
return 2 if $d < $main::systime - $dupage;
- my $dupkey = "C$d|$sfi|$k|$a|$r";
+ my $dupkey = "C$d";
return DXDupe::check($dupkey, $main::systime+$dupage);
}