projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix initial set of bugs pointed on mailing list
[spider.git]
/
perl
/
WCY.pm
diff --git
a/perl/WCY.pm
b/perl/WCY.pm
index 85f2b8178bd8aad882cf8e976b2251d948bac1ce..1c499e5251dca6e900fd8cf5b782ed235dd1307e 100644
(file)
--- a/
perl/WCY.pm
+++ b/
perl/WCY.pm
@@
-19,12
+19,6
@@
use Data::Dumper;
use strict;
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 $filterdef);
use vars qw($date $sfi $k $expk $a $r $sa $gmf $au @allowed @denied $fp $node $from
$dirprefix $param
$duplth $dupage $filterdef);
@@
-40,7
+34,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
@@
-90,8
+84,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));
@@
-242,12
+237,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);
}