projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix problem with only some 17m spots coming out in sh/dx on 17m
[spider.git]
/
perl
/
Spot.pm
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 074ae740b4aa7842b0a24ef4fa43e4cd709a9910..28a8dd7201a9690abb654aba76cec1cb75c2b0b6 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-19,6
+19,13
@@
use DXDupe;
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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef);
$fp = undef;
use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef);
$fp = undef;
@@
-167,15
+174,15
@@
sub search
my $ref;
my $i;
my $count;
my $ref;
my $i;
my $count;
- my
@today = Julian::unixtoj
(time());
- my
@
fromdate;
- my
@
todate;
+ my
$today = Julian::Day->new
(time());
+ my
$
fromdate;
+ my
$
todate;
$dayfrom = 0 if !$dayfrom;
$dayto = $maxdays unless $dayto;
$dayto = $dayfrom + $maxdays if $dayto < $dayfrom;
$dayfrom = 0 if !$dayfrom;
$dayto = $maxdays unless $dayto;
$dayto = $dayfrom + $maxdays if $dayto < $dayfrom;
-
@fromdate = Julian::sub(@today,
$dayfrom);
-
@todate = Julian::sub(@fromdate,
$dayto);
+
$fromdate = $today->sub(
$dayfrom);
+
$todate = $fromdate->sub(
$dayto);
$from = 0 unless $from;
$to = $defaultspots unless $to;
$hint = $hint ? "next unless $hint" : "";
$from = 0 unless $from;
$to = $defaultspots unless $to;
$hint = $hint ? "next unless $hint" : "";
@@
-211,11
+218,11
@@
sub search
$fp->close; # close any open files
for ($i = $count = 0; $i < $maxdays; ++$i) { # look thru $maxdays worth of files only
$fp->close; # close any open files
for ($i = $count = 0; $i < $maxdays; ++$i) { # look thru $maxdays worth of files only
- my
@now = Julian::sub(@fromdate,
$i); # but you can pick which $maxdays worth
- last if
Julian::cmp(@now, @
todate) <= 0;
+ my
$now = $fromdate->sub(
$i); # but you can pick which $maxdays worth
+ last if
$now->cmp($
todate) <= 0;
my @spots = ();
my @spots = ();
- my $fh = $fp->open(
@
now); # get the next file
+ my $fh = $fp->open(
$
now); # get the next file
if ($fh) {
my $in;
eval $eval; # do the search on this file
if ($fh) {
my $in;
eval $eval; # do the search on this file
@@
-243,7
+250,7
@@
sub ftor
while (@b) {
my $aa = shift @a;
my $bb = shift @b;
while (@b) {
my $aa = shift @a;
my $bb = shift @b;
- if (@b < (length $d)
- 1
) {
+ if (@b < (length $d)) {
$out .= '\\d';
} elsif ($aa eq $bb) {
$out .= $aa;
$out .= '\\d';
} elsif ($aa eq $bb) {
$out .= $aa;
@@
-279,11
+286,11
@@
sub formatl
#
# return all the spots from a day's file as an array of references
# the parameter passed is a julian day
#
# return all the spots from a day's file as an array of references
# the parameter passed is a julian day
-sub readfile
+sub readfile
($)
{
my @spots;
{
my @spots;
- my $fh = $fp->open(
@_
);
+ my $fh = $fp->open(
shift
);
if ($fh) {
my $in;
while (<$fh>) {
if ($fh) {
my $in;
while (<$fh>) {
@@
-304,12
+311,19
@@
sub dup
$freq = sprintf "%.1f", $freq; # normalise frequency
chomp $text;
$freq = sprintf "%.1f", $freq; # normalise frequency
chomp $text;
+ $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
$text = substr($text, 0, $duplth) if length $text > $duplth;
unpad($text);
$text = substr($text, 0, $duplth) if length $text > $duplth;
unpad($text);
- $text =
~ s/[\\\%]\d+//g
;
+ $text =
pack("C*", map {$_ & 127} unpack("C*", $text))
;
$text =~ s/[^a-zA-Z0-9]//g;
$text =~ s/[^a-zA-Z0-9]//g;
+ for (0,60,120,180,240,300) {
+ my $dt = $d - $_;
+ my $dupkey = "X$freq|$call|$dt|\L$text";
+ return 1 if DXDupe::find($dupkey);
+ }
my $dupkey = "X$freq|$call|$d|\L$text";
my $dupkey = "X$freq|$call|$d|\L$text";
- return DXDupe::check($dupkey, $main::systime+$dupage);
+ DXDupe::add($dupkey, $main::systime+$dupage);
+ return 0;
}
sub listdups
}
sub listdups
@@
-317,11
+331,11
@@
sub listdups
return DXDupe::listdups('X', $dupage, @_);
}
return DXDupe::listdups('X', $dupage, @_);
}
-sub genstats
+sub genstats
($)
{
{
- my
@date = @_
;
- my $in = $fp->open(
@
date);
- my $out = $statp->open(
@
date, 'w');
+ my
$date = shift
;
+ my $in = $fp->open(
$
date);
+ my $out = $statp->open(
$
date, 'w');
my @freq = (
[0, Bands::get_freq('160m')],
[1, Bands::get_freq('80m')],
my @freq = (
[0, Bands::get_freq('160m')],
[1, Bands::get_freq('80m')],
@@
-382,20
+396,19
@@
sub genstats
}
# return true if the stat file is newer than than the spot file
}
# return true if the stat file is newer than than the spot file
-sub checkstats
+sub checkstats
($)
{
{
- my
@date = @_
;
- my $in = $fp->mtime(
@
date);
- my $out = $statp->mtime(
@
date);
+ my
$date = shift
;
+ my $in = $fp->mtime(
$
date);
+ my $out = $statp->mtime(
$
date);
return defined $out && defined $in && $out >= $in;
}
# daily processing
sub daily
{
return defined $out && defined $in && $out >= $in;
}
# daily processing
sub daily
{
- my @date = Julian::unixtoj($main::systime);
- @date = Julian::sub(@date, 1);
- genstats(@date) unless checkstats(@date);
+ my $date = Julian::Day->new($main::systime)->sub(1);
+ genstats($date) unless checkstats($date);
}
1;
}
1;