Prepare for git repository

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index b4fd27c4c1f5c69c757120742f61fecc62b5b568..ed78b40cefb7e22e8c55ffd546c95d50bca344bc 100644 (file)
--- 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;
@@ -169,7 +163,7 @@ sub prepare
        my @out = @_[0..4];      # just up to the spotter
 
        # normalise frequency
-       $out[0] = sprintf "%.1f", $out[0]+0.05;
+       $out[0] = sprintf "%.1f", $out[0];
   
        # remove ssids and /xxx if present on spotter
        $out[4] =~ s/-\d+$//o;
@@ -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;