fix pedantic 'uninitialised' warning in VE7CC.pm

[spider.git] / perl / VE7CC.pm

diff --git a/perl/VE7CC.pm b/perl/VE7CC.pm
index 58964c5a67304d5ccbd46c38b32a4717083f913c..d90430ca5a661fb3911165c4ea9cade535d5d997 100644 (file)
--- a/perl/VE7CC.pm
+++ b/perl/VE7CC.pm
@@ -19,12 +19,6 @@ use DXUser;
 
 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;
-
 sub dx_spot
 {
        my $self = shift;                       # this may be useful some day
@@ -33,7 +27,7 @@ sub dx_spot
        my $t = shift;
        my $loc_spotted = '';
        my $loc_spotter = '';
-       my $ref = DXUser->get_current($spotted);
+       my $ref = DXUser::get_current($spotted);
        if ($ref) {
                my $loc = $ref->qra || '';
                $loc_spotted =substr($loc, 0, 4) if $loc;
@@ -48,13 +42,15 @@ sub dx_spot
        
        my $spotted_cc = (Prefix::cty_data($spotted))[5];
        my $spotter_cc = (Prefix::cty_data($_[1]))[5];
-       $ref = DXUser->get_current($_[1]);
+       $ref = DXUser::get_current($_[1]);
        if ($ref) {
                my $loc = $ref->qra || '';
                $loc_spotter = substr($loc, 0, 4) if $loc;
        }
+       my $text = $_[4] || '';
+       $text =~ s/\^/~/g;
        
-       return sprintf("CC11^%0.1f^%s^", $freq, $spotted) . join('^', cldate($t), ztime($t), @_, $spotted_cc, $spotter_cc, $loc_spotted, $loc_spotter);
+       return sprintf("CC11^%0.1f^%s^", $freq, $spotted) . join('^', cldate($t), ztime($t), @_[0..3], $text, @_[5..10], $spotted_cc, $spotter_cc, $loc_spotted, $loc_spotter);
 }
 
 1;