projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix free talking in command mode
[spider.git]
/
perl
/
Spot.pm
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 5ea169f2f48021be9b6d37224feb32dc7737e63e..0df6891799dd8a3006da9c2a1c1880fcc16a86b6 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-22,10
+22,8
@@
use QSL;
use strict;
use vars qw($VERSION $BRANCH);
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;
+
+($VERSION, $BRANCH) = dxver(q$Revision$);
use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth);
use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth);
@@
-394,7
+392,8
@@
sub dup
# remove SSID or area
$by =~ s|[-/]\d+$||;
# remove SSID or area
$by =~ s|[-/]\d+$||;
- $freq = sprintf "%.1f", $freq; # normalise frequency
+# $freq = sprintf "%.1f", $freq; # normalise frequency
+ $freq = int $freq; # normalise frequency
$call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
chomp $text;
$call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
chomp $text;
@@
-407,6
+406,7
@@
sub dup
}
}
my $otext = $text;
}
}
my $otext = $text;
+ $text =~ s/^\+\w+\s*//; # remove leading LoTW callsign
$text = pack("C*", map {$_ & 127} unpack("C*", $text));
$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
$text =~ s/[^\w]//g;
$text = pack("C*", map {$_ & 127} unpack("C*", $text));
$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
$text =~ s/[^\w]//g;