projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add more code gradually
[spider.git]
/
perl
/
WCY.pm
diff --git
a/perl/WCY.pm
b/perl/WCY.pm
index ee9679c648c776fa763d159387e8c1827279dce9..db44a2333faee99ffd3990358cd4b34dbed5915a 100644
(file)
--- a/
perl/WCY.pm
+++ b/
perl/WCY.pm
@@
-18,6
+18,13
@@
use DXDebug;
use Data::Dumper;
use strict;
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,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 $filterdef);
use vars qw($date $sfi $k $expk $a $r $sa $gmf $au @allowed @denied $fp $node $from
$dirprefix $param
$duplth $dupage $filterdef);
@@
-33,7
+40,7
@@
$gmf = ""; # Geomag activity
$au = 'no'; # aurora warning
$node = ""; # originating node
$from = ""; # who this came from
$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
@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
@@
-45,13
+52,13
@@
$filterdef = bless ([
# tag, sort, field, priv, special parser
['by', 'c', 11],
['origin', 'c', 12],
# 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', 'n
c
', 14],
+ ['by_itu', 'n
i
', 15],
+ ['by_zone', 'n
z
', 16],
+ ['origin_dxcc', '
n
c', 17],
+ ['origin_itu', '
ni
', 18],
+ ['origin_
zone', 'nz
', 19],
], 'Filter::Cmd');
], 'Filter::Cmd');
@@
-83,8
+90,9
@@
sub store
sub update
{
my ($mydate, $mytime, $mysfi, $mya, $myk, $myexpk, $myr, $mysa, $mygmf, $myau, $myfrom, $mynode) = @_;
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));
(@allowed == 0 && @denied == 0)) {
# my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
@@
-150,12
+158,13
@@
sub search
{
my $from = shift;
my $to = shift;
{
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 $pattern = shift;
my $search;
my @out;
my $eval;
my $count;
+ my $i;
$search = 1;
$eval = qq(
$search = 1;
$eval = qq(
@@
-173,9
+182,8
@@
sub search
);
$fp->close; # close any open files
);
$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 @in = ();
if ($fh) {
while (<$fh>) {
@@
-218,8
+226,8
@@
sub print_item
#
sub readfile
{
#
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;
my @spots = ();
my @in;
@@
-235,12
+243,12
@@
sub readfile
# enter the spot for dup checking and return true if it is already a dup
sub dup
{
# 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;
# 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);
}
return DXDupe::check($dupkey, $main::systime+$dupage);
}