1. added wantgrid (to control display of grid square info on DX Broadcasts)

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index afc3410fb6e04045bdf7c774e766c6822a80f190..3f4313ef8268dd75f4fffae2d7b369711180929a 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -168,18 +168,21 @@ sub search
 # format a spot for user output in 'broadcast' mode
 sub formatb
 {
-       my @dx = @_;
-       my $t = ztime($dx[2]);
-       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-30s %s", "$dx[4]:", $dx[0], $dx[1], $dx[3], $t ;
+       my $wantgrid = shift;
+       my $t = ztime($_[2]);
+       my $ref = DXUser->get_current($_[4]);
+       my $loc = $ref->qra if $ref && $ref->qra && $wantgrid;
+       $loc = ' ' . substr($ref->qra, 0, 4) if $loc;
+       $loc = "" unless $loc;
+       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-30s %s$loc", "$_[4]:", $_[0], $_[1], $_[3], $t ;
 }
 
 # format a spot for user output in list mode
 sub formatl
 {
-       my @dx = @_;
-       my $t = ztime($dx[2]);
-       my $d = cldate($dx[2]);
-       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $dx[0], $dx[1], $d, $t, $dx[3], "<$dx[4]" ;
+       my $t = ztime($_[2]);
+       my $d = cldate($_[2]);
+       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, $_[3], "<$_[4]" ;
 }
 
 #
@@ -209,9 +212,9 @@ sub dup
        return 2 if $d < $main::systime - $dupage;
  
        $freq = sprintf "%.1f", $freq;       # normalise frequency
-       $d /= 60;                            # to the nearest minute
        chomp $text;
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
+       unpad($text);
        my $dupkey = "$freq|$call|$d|$text";
        return 1 if exists $dup{$dupkey};
        $dup{$dupkey} = $d * 60;         # in seconds (to the nearest minute)