X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=ed78b40cefb7e22e8c55ffd546c95d50bca344bc;hb=8f5f9afaa7488fd046147e6b9136b0fc772a1463;hp=5ea169f2f48021be9b6d37224feb32dc7737e63e;hpb=20efba5d5f656113144785e0ef84296e6d2c2e69;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 5ea169f2..ed78b40c 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -21,12 +21,6 @@ use QSL; 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($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth); $fp = undef; @@ -394,7 +388,8 @@ sub dup # 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; @@ -407,6 +402,7 @@ sub dup } } 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;