put pc16/17 handling back the way it was

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 66652795f49e82a777959ad49ae66a66d0c436a2..ef8d9ccde92d6643181a085824e89b052f75dc1c 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -22,10 +22,8 @@ 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;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots );
 
@@ -122,8 +120,7 @@ sub prepare
        $out[4] =~ s/-\d+$//o;
 
        # remove leading and trailing spaces
-       unpad($out[3]);
-       
+       $out[3] = unpad($out[3]);
        
        # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
        my @spd = Prefix::cty_data($out[1]);