X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=1e7de69a7b32a5f9dbe8ab2651528143984fb801;hb=261c75481017f32ca491df475b36e9600ca430a1;hp=afc3410fb6e04045bdf7c774e766c6822a80f190;hpb=88665a2bed3b9ec9e97237938a95a045b2a21bb4;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index afc3410f..1e7de69a 100644
--- 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,12 +212,12 @@ 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)
+	$dup{$dupkey} = $d;         # in seconds (to the nearest minute)
 	return 0; 
 }
 
@@ -229,10 +232,13 @@ sub process
 
 sub listdups
 {
+	my $regex = shift;
+	$regex = '.*' unless $regex;
+	$regex =~ s/[\$\@\%]//g;
 	my @out;
-	for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
+	for (sort { $dup{$a} <=> $dup{$b} } grep { m{$regex}i } keys %dup) {
 		my $val = $dup{$_};
-		push @out, "$_ = $val (" . cldatetime($val) . ")";
+		push @out, "$_ = " . cldatetime($val);
 	}
 	return @out;
 }