X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=7f6265aca805c3fea907e9fdc19361b71d8ec7c6;hb=ad222bb929a17f8ad54c567d4f59f68c5d1a8bbd;hp=d88a5f7f4d425a0ac2b22769beada412df347578;hpb=4d8e254ea4c77a348c96c24fdbc265590c75fd5c;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index d88a5f7f..7f6265ac 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -70,8 +70,8 @@ $totalspots = $hfspots = $vhfspots = 0;
 $use_db_for_search = 0;
 
 our %spotcache;					# the cache of data within the last $spotcachedays 0 or 2+ days
-our $spotcachedays = 0;
-
+our $spotcachedays = 2;			# default 2 days worth
+our $minselfspotqrg = 1240000;	# minimum freq above which self spotting is allowed
 
 our $readback = 1;
 
@@ -458,9 +458,20 @@ 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 $t = ztime($_[3]);
+	my $d = cldate($_[3]);
+	my $spotter = "<$_[5]>";
+	my $comment = $_[4] || '';
+	$comment =~ s/\t+/ /g;
+	my $cl = length $comment;
+	my $s = sprintf "%9.1f %-11s %s %s", $_[1], $_[2], $d, $t;
+	my $width = ($_[0] ? $_[0] : 80) - length($spotter) - length($s) - 4;
+	
+	$comment = substr $comment, 0, $width if $cl > $width;
+	$comment .= ' ' x ($width-$cl) if $cl < $width;
+
+#	return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
+	return "$s $comment$spotter";
 }
 
 # enter the spot for dup checking and return true if it is already a dup