use DXDupe;
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 $a $r $forecast @allowed @denied $fp $node $from
$dirprefix $param
$duplth $dupage $filterdef);
# tag, sort, field, priv, special parser
['by', 'c', 7],
['origin', 'c', 8],
- ['channel', 'n', 9],
- ['by_dxcc', 'n', 10],
- ['by_itu', 'n', 11],
- ['by_zone', 'n', 12],
- ['origin_dxcc', 'c', 13],
- ['origin_itu', 'c', 14],
- ['origin_itu', 'c', 15],
+ ['channel', 'c', 9],
+ ['by_dxcc', 'nc', 10],
+ ['by_itu', 'ni', 11],
+ ['by_zone', 'nz', 12],
+ ['origin_dxcc', 'nc', 13],
+ ['origin_itu', 'ni', 14],
+ ['origin_zone', 'nz', 15],
], 'Filter::Cmd');
sub init
sub update
{
my ($mydate, $mytime, $mysfi, $mya, $myk, $myforecast, $myfrom, $mynode, $myr) = @_;
- 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;
$fp->close; # close any open files
- my $fh = $fp->open(@date);
+ my $fh = $fp->open($date);
for ($count = 0; $count < $to; ) {
my @in = ();
if ($fh) {
#
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;