X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=b29592a3a756eb3c8d3c246e78e8ac3827445125;hb=81a5b9bf8d3101bbc1a8190a9de72de0117d302a;hp=fcf2d261a154f9c2e74b37e168183b5039079431;hpb=e83b70ecab022dbbeac0b56f67ed2e4bed609e86;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index fcf2d261..b29592a3 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -168,22 +168,21 @@ sub search
 # format a spot for user output in 'broadcast' mode
 sub formatb
 {
-	my @dx = @_;
-	my $t = ztime($dx[2]);
-	my $ref = DXUser->get_current($dx[4]);
-	my $loc = $ref->qra if $ref && $ref->qra;
-	$loc = substr($ref->qra, 0, 4) if $loc;
+	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", "$dx[4]:", $dx[0], $dx[1], $dx[3], $t ;
+	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]" ;
 }
 
 #
@@ -218,7 +217,7 @@ sub dup
 	unpad($text);
 	my $dupkey = "$freq|$call|$d|$text";
 	return 1 if exists $dup{$dupkey};
-	$dup{$dupkey} = $d * 60;         # in seconds (to the nearest minute)
+	$dup{$dupkey} = $d;         # in seconds (to the nearest minute)
 	return 0; 
 }