fix warnings on $BRANCH

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 462cb673f7fd02db3b00e6bb94a4e4a4ba9df3df..d7c990d1cabedf9baf1bdfb3f1d4fec031008204 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -23,7 +23,7 @@ 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));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -122,8 +122,7 @@ sub prepare
        $out[4] =~ s/-\d+$//o;
 
        # remove leading and trailing spaces
-       $_[3] = unpad($_[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]);
@@ -136,7 +135,7 @@ sub prepare
 
 sub add
 {
-       my $buf = join("\^", @_);
+       my $buf = join('^', @_);
        $fp->writeunix($_[2], $buf);
        $totalspots++;
        if ($_[0] <= 30000) {
@@ -292,9 +291,44 @@ sub ftor
 # format a spot for user output in list mode
 sub formatl
 {
-       my $t = ztime($_[2]);
-       my $d = cldate($_[2]);
-       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, $_[3], "<$_[4]" ;
+       my $spot = ref $_[0] ? shift : \@_;
+
+       my $t = ztime($spot->[2]);
+       my $d = cldate($spot->[2]);
+       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $spot->[0], $spot->[1], $d, $t, $spot->[3], "<$spot->[4]" ;
+}
+
+# format a spot for normal output
+sub format_dx_spot
+{
+       my $dxchan = shift;
+       my $spot = ref $_[0] ? shift : \@_;
+       
+       my $t = ztime($spot->[2]);
+       my $loc = '';
+       my $clth = $dxchan->{consort} eq 'local' ? 29 : 30;
+       my $comment = substr $spot->[3], 0, $clth; 
+       $comment .= ' ' x ($clth - length($comment));
+       if ($dxchan->{user}->wantgrid) { 
+               my $ref = DXUser->get_current($spot->[4]);
+               if ($ref) {
+                       $loc = $ref->qra || '';
+                       $loc = ' ' . substr($loc, 0, 4) if $loc;
+               }
+       }
+
+       if ($dxchan->{user}->wantdxitu) {
+               $loc = ' ' . sprintf("%2d", $spot->[10]) if defined $spot->[10];
+               $comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[8]) if defined $spot->[8]; 
+       } elsif ($dxchan->{user}->wantdxcq) {
+               $loc = ' ' . sprintf("%2d", $spot->[11]) if defined $spot->[11];
+               $comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[9]) if defined $spot->[9]; 
+       } elsif ($dxchan->{user}->wantusstate) {
+               $loc = ' ' . $spot->[13] if $spot->[13];
+               $comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . $spot->[12] if $spot->[12]; 
+       }
+
+       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$spot->[4]:", $spot->[0], $spot->[1], $comment;
 }
 
 #