X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=ef8d9ccde92d6643181a085824e89b052f75dc1c;hb=14cb55073f64836f3f2a1aaf3a86207dec4fa103;hp=6c5c9162ea2547d129b6e84a41525698baab8588;hpb=2538c30a81811749c0cdaf55b8c9f65ee7c5167d;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 6c5c9162..ef8d9ccd 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -22,10 +22,8 @@ use QSL;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots );
 
@@ -102,9 +100,6 @@ sub init
 	mkdir "$dirprefix", 0777 if !-e "$dirprefix";
 	$fp = DXLog::new($dirprefix, "dat", 'd');
 	$statp = DXLog::new($dirprefix, "dys", 'd');
-	my $rm = $main::is_win ? 'del' : 'rm -f';
-	system("$rm $main::data/$dirprefix/*/*.bys");
-	system("$rm $main::data/$dirprefix/*/*.cys");
 }
 
 sub prefix
@@ -125,8 +120,7 @@ sub prepare
 	$out[4] =~ s/-\d+$//o;
 
 	# remove leading and trailing spaces
-	$_[3] = unpad($_[3]);
-	
+	$out[3] = unpad($out[3]);
 	
 	# add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
 	my @spd = Prefix::cty_data($out[1]);
@@ -139,7 +133,7 @@ sub prepare
 
 sub add
 {
-	my $buf = join("\^", @_);
+	my $buf = join('^', @_);
 	$fp->writeunix($_[2], $buf);
 	$totalspots++;
 	if ($_[0] <= 30000) {
@@ -295,9 +289,44 @@ 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 $spot = ref $_[0] ? shift : \@_;
+
+	my $t = ztime($spot->[2]);
+	my $d = cldate($spot->[2]);
+	return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $spot->[0], $spot->[1], $d, $t, $spot->[3], "<$spot->[4]" ;
+}
+
+# format a spot for normal output
+sub format_dx_spot
+{
+	my $dxchan = shift;
+	my $spot = ref $_[0] ? shift : \@_;
+	
+	my $t = ztime($spot->[2]);
+	my $loc = '';
+	my $clth = $dxchan->{consort} eq 'local' ? 29 : 30;
+	my $comment = substr $spot->[3], 0, $clth; 
+	$comment .= ' ' x ($clth - length($comment));
+	if ($dxchan->{user}->wantgrid) { 
+		my $ref = DXUser->get_current($spot->[4]);
+		if ($ref) {
+			$loc = $ref->qra || '';
+			$loc = ' ' . substr($loc, 0, 4) if $loc;
+		}
+	}
+
+	if ($dxchan->{user}->wantdxitu) {
+		$loc = ' ' . sprintf("%2d", $spot->[10]) if defined $spot->[10];
+		$comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[8]) if defined $spot->[8]; 
+	} elsif ($dxchan->{user}->wantdxcq) {
+		$loc = ' ' . sprintf("%2d", $spot->[11]) if defined $spot->[11];
+		$comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[9]) if defined $spot->[9]; 
+	} elsif ($dxchan->{user}->wantusstate) {
+		$loc = ' ' . $spot->[13] if $spot->[13];
+		$comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . $spot->[12] if $spot->[12]; 
+	}
+
+	return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$spot->[4]:", $spot->[0], $spot->[1], $comment;
 }
 
 #