#
# Copyright (c) 2000 - Dirk Koopman G1TLH
#
-# $Id$
+#
#
package WCY;
use Data::Dumper;
use strict;
+
use vars qw($date $sfi $k $expk $a $r $sa $gmf $au @allowed @denied $fp $node $from
$dirprefix $param
$duplth $dupage $filterdef);
$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";
+$dirprefix = "$main::local_data/wcy";
$param = "$dirprefix/param";
$filterdef = bless ([
# tag, sort, field, priv, special parser
['by', 'c', 11],
['origin', 'c', 12],
- ['channel', 'n', 13],
- ['by_dxcc', 'n', 14],
- ['by_itu', 'n', 15],
- ['by_zone', 'n', 16],
- ['origin_dxcc', 'c', 17],
- ['origin_itu', 'c', 18],
- ['origin_itu', 'c', 19],
+ ['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));
# 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);
}