X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=7f6265aca805c3fea907e9fdc19361b71d8ec7c6;hb=b1c75fc83d3dd1d82a2022f6ace2cc20ced19194;hp=515c462624eefcd7228ca32fe5b05e708bc95500;hpb=4746cf71bae031c57c24600713d7cfc281d71e20;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 515c4626..7f6265ac 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -460,13 +460,18 @@ sub formatl
 {
 	my $t = ztime($_[3]);
 	my $d = cldate($_[3]);
-	my $width = ($_[0] ? $_[0] : 80) - 80 + 28;
+	my $spotter = "<$_[5]>";
 	my $comment = $_[4] || '';
-	$comment = substr $comment, 0, $width if length $comment > $width;
-	$comment .= ' ' x ($width - length($comment)) if $comment < $width;
+	$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 sprintf "%8.1f  %-11s %s %s  ${comment}%7s>", $_[1], $_[2], $d, $t, "<$_[5]" ;
+	return "$s $comment$spotter";
 }
 
 # enter the spot for dup checking and return true if it is already a dup