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

diff --git a/perl/Spot.pm b/perl/Spot.pm
index e9dd2790..7f6265ac 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -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