X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=6262d79e3b16cf8bec846bf5277cb44290eda296;hb=refs%2Ftags%2FR_1_50;hp=963ed4a5895945f9cbf2bf8a7f5bf0900e8a3b10;hpb=0aaec2fed8977d5e1cd02a4f1432bdde135a1044;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 963ed4a5..6262d79e 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -22,7 +22,7 @@ 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; +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); $main::build += $VERSION; $main::branch += $BRANCH; @@ -30,7 +30,7 @@ use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupa $fp = undef; $statp = undef; -$maxspots = 50; # maximum spots to return +$maxspots = 100; # maximum spots to return $defaultspots = 10; # normal number of spots to return $maxdays = 100; # normal maximum no of days to go back $dirprefix = "spots"; @@ -264,18 +264,6 @@ sub ftor return $out; } -# format a spot for user output in 'broadcast' mode -sub formatb -{ - 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 %-29s %s$loc", "$_[4]:", $_[0], $_[1], $_[3], $t ; -} - # format a spot for user output in list mode sub formatl { @@ -311,6 +299,7 @@ sub dup return 2 if $d < $main::systime - $dupage; $freq = sprintf "%.1f", $freq; # normalise frequency + $call = substr($call, 0, 12) if length $call > 12; chomp $text; $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; $text = substr($text, 0, $duplth) if length $text > $duplth;