projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix merge command
[spider.git]
/
perl
/
Spot.pm
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 67d8a6580aae023dfc6664c3985babfad0c7f9e5..8e83667898793142b80ae1ec3cc430f97f53f14a 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-23,7
+23,7
@@
use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $fil
$fp = undef;
$maxspots = 50; # maximum spots to return
$defaultspots = 10; # normal number of spots to return
$fp = undef;
$maxspots = 50; # maximum spots to return
$defaultspots = 10; # normal number of spots to return
-$maxdays =
365;
# normal maximum no of days to go back
+$maxdays =
100;
# normal maximum no of days to go back
$dirprefix = "spots";
$duplth = 20; # the length of text to use in the deduping
$dupage = 3*3600; # the length of time to hold spot dups
$dirprefix = "spots";
$duplth = 20; # the length of text to use in the deduping
$dupage = 3*3600; # the length of time to hold spot dups
@@
-95,20
+95,20
@@
sub prefix
return $fp->{prefix};
}
return $fp->{prefix};
}
-#
add a spot to the data file (call as Spot::add)
-sub
add
+#
fix up the full spot data from the basic spot data
+sub
prepare
{
{
-
my @spot = @_;
# $freq, $call, $t, $comment, $spotter = @_
- my @out = @
spot
[0..4]; # just up to the spotter
+ # $freq, $call, $t, $comment, $spotter = @_
+ my @out = @
_
[0..4]; # just up to the spotter
# normalise frequency
# normalise frequency
- $
spot[0] = sprintf "%.f", $spot
[0];
+ $
_[0] = sprintf "%.1f", $_
[0];
# remove ssids if present on spotter
$out[4] =~ s/-\d+$//o;
# remove leading and trailing spaces
# remove ssids if present on spotter
$out[4] =~ s/-\d+$//o;
# remove leading and trailing spaces
- $
spot[3] = unpad($spot
[3]);
+ $
_[3] = unpad($_
[3]);
# add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
my @dxcc = Prefix::extract($out[1]);
# add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
my @dxcc = Prefix::extract($out[1]);
@@
-121,17
+121,16
@@
sub add
my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
push @out, $spotter_dxcc;
my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
push @out, $spotter_dxcc;
- push @out, $spot[5];
-
- my $buf = join("\^", @out);
-
- # compare dates to see whether need to open another save file (remember, redefining $fp
- # automagically closes the output file (if any)).
- $fp->writeunix($out[2], $buf);
-
+ push @out, $_[5];
return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
}
return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
}
+sub add
+{
+ my $buf = join("\^", @_[0..7]);
+ $fp->writeunix($_[2], $buf);
+}
+
# search the spot database for records based on the field no and an expression
# this returns a set of references to the spots
#
# search the spot database for records based on the field no and an expression
# this returns a set of references to the spots
#
@@
-170,7
+169,8
@@
sub search
my @todate;
$dayfrom = 0 if !$dayfrom;
my @todate;
$dayfrom = 0 if !$dayfrom;
- $dayto = $maxdays if !$dayto;
+ $dayto = $maxdays unless $dayto;
+ $dayto = $dayfrom + $maxdays if $dayto < $dayfrom;
@fromdate = Julian::sub(@today, $dayfrom);
@todate = Julian::sub(@fromdate, $dayto);
$from = 0 unless $from;
@fromdate = Julian::sub(@today, $dayfrom);
@todate = Julian::sub(@fromdate, $dayto);
$from = 0 unless $from;
@@
-183,7
+183,7
@@
sub search
$expr =~ s/\$f(\d)/\$ref->[$1]/g; # swap the letter n for the correct field name
# $expr =~ s/\$f(\d)/\$spots[$1]/g; # swap the letter n for the correct field name
$expr =~ s/\$f(\d)/\$ref->[$1]/g; # swap the letter n for the correct field name
# $expr =~ s/\$f(\d)/\$spots[$1]/g; # swap the letter n for the correct field name
- dbg("
search", "expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n"
);
+ dbg("
hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search'
);
# build up eval to execute
$eval = qq(
# build up eval to execute
$eval = qq(
@@
-230,6
+230,7
@@
sub ftor
my ($a, $b) = @_;
return undef unless $a < $b;
$b--;
my ($a, $b) = @_;
return undef unless $a < $b;
$b--;
+ my $d = $b - $a;
my @a = split //, $a;
my @b = split //, $b;
my $out;
my @a = split //, $a;
my @b = split //, $b;
my $out;
@@
-239,12
+240,14
@@
sub ftor
while (@b) {
my $aa = shift @a;
my $bb = shift @b;
while (@b) {
my $aa = shift @a;
my $bb = shift @b;
- if ($aa eq $bb) {
+ if (@b < (length $d) - 1) {
+ $out .= '\\d';
+ } elsif ($aa eq $bb) {
$out .= $aa;
} elsif ($aa < $bb) {
$out .= "[$aa-$bb]";
} else {
$out .= $aa;
} elsif ($aa < $bb) {
$out .= "[$aa-$bb]";
} else {
- $out .= "[
$bb-$aa
]";
+ $out .= "[
0-$bb$aa-9
]";
}
}
return $out;
}
}
return $out;
@@
-300,6
+303,7
@@
sub dup
chomp $text;
$text = substr($text, 0, $duplth) if length $text > $duplth;
unpad($text);
chomp $text;
$text = substr($text, 0, $duplth) if length $text > $duplth;
unpad($text);
+ $text =~ s/[\\\%]\d+//g;
$text =~ s/[^a-zA-Z0-9]//g;
my $dupkey = "X$freq|$call|$d|\L$text";
return DXDupe::check($dupkey, $main::systime+$dupage);
$text =~ s/[^a-zA-Z0-9]//g;
my $dupkey = "X$freq|$call|$d|\L$text";
return DXDupe::check($dupkey, $main::systime+$dupage);