projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix spurious Text::Wrap warning on console.pl
[spider.git]
/
perl
/
Geomag.pm
diff --git
a/perl/Geomag.pm
b/perl/Geomag.pm
index b1985f0541509f8dd273d8be66243127e9e58a6b..3447743ffafc76a47b14e60481630006db1efddc 100644
(file)
--- a/
perl/Geomag.pm
+++ b/
perl/Geomag.pm
@@
-5,7
+5,7
@@
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package Geomag;
#
package Geomag;
@@
-20,12
+20,6
@@
use DXDupe;
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,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);
use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from
$dirprefix $param
$duplth $dupage $filterdef);
@@
-44,7
+38,7
@@
$from = ""; # who this came from
$duplth = 20; # the length of text to use in the deduping
$dupage = 12*3600; # the length of time to hold spot dups
$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/wwv";
+$dirprefix = "$main::
local_
data/wwv";
$param = "$dirprefix/param";
$filterdef = bless ([
$param = "$dirprefix/param";
$filterdef = bless ([
@@
-98,7
+92,7
@@
sub update
(@allowed == 0 && @denied == 0)) {
# my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
(@allowed == 0 && @denied == 0)) {
# my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
- if ($mydate >
=
$date) {
+ if ($mydate > $date) {
if ($myr) {
$r = 0 + $myr;
} else {
if ($myr) {
$r = 0 + $myr;
} else {
@@
-268,12
+262,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, $k, $a, $text) = @_;
+ my ($d, $sfi, $k, $a, $text
, $call
) = @_;
# dump if too old
return 2 if $d < $main::systime - $dupage;
# dump if too old
return 2 if $d < $main::systime - $dupage;
- my $dupkey = "W$d|$sfi|$k|$a";
+ my $dupkey = "W$d|$sfi|$k|$a
|$call
";
return DXDupe::check($dupkey, $main::systime+$dupage);
}
return DXDupe::check($dupkey, $main::systime+$dupage);
}