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;
-use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef);
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots);
$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";
['call', 'c', 1],
['info', 't', 3],
['by', 'c', 4],
- ['call_dxcc', 'n', 5],
- ['by_dxcc', 'n', 6],
+ ['call_dxcc', 'nc', 5],
+ ['by_dxcc', 'nc', 6],
['origin', 'c', 7, 9],
- ['call_itu', 'n', 8],
- ['call_zone', 'n', 9],
- ['by_itu', 'n', 10],
- ['by_zone', 'n', 11],
- ['channel', 'n', 12, 9],
+ ['call_itu', 'ni', 8],
+ ['call_zone', 'nz', 9],
+ ['by_itu', 'ni', 10],
+ ['by_zone', 'nz', 11],
+ ['channel', 'c', 12],
], 'Filter::Cmd');
-
+$totalspots = $hfspots = $vhfspots = 0;
# create a Spot Object
sub new
{
mkdir "$dirprefix", 0777 if !-e "$dirprefix";
$fp = DXLog::new($dirprefix, "dat", 'd');
- $statp = DXLog::new($dirprefix, "bys", 'd');
+ $statp = DXLog::new($dirprefix, "cys", 'd');
+ system("rm -f $main::data/$dirprefix/2001/*.bys");
}
sub prefix
# add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
my @dxcc = Prefix::extract($out[1]);
- my $spotted_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0;
+ my $spotted_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 666;
my $spotted_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
my $spotted_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
push @out, $spotted_dxcc;
@dxcc = Prefix::extract($out[4]);
- my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0;
+ my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 666;
my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
push @out, $spotter_dxcc;
{
my $buf = join("\^", @_[0..7]);
$fp->writeunix($_[2], $buf);
+ $totalspots++;
+ if ($_[0] <= 30000) {
+ $hfspots++;
+ } else {
+ $vhfspots++;
+ }
}
# search the spot database for records based on the field no and an expression
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 %-30s %s$loc", "$_[4]:", $_[0], $_[1], $_[3], $t ;
-}
-
# format a spot for user output in list mode
sub formatl
{
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;
[9, Bands::get_freq('6m')],
[10, Bands::get_freq('4m')],
[11, Bands::get_freq('2m')],
- [12, Bands::get_freq('70cm')],
- [13, Bands::get_freq('13cm')],
- [14, Bands::get_freq('9cm')],
- [15, Bands::get_freq('6cm')],
- [16, Bands::get_freq('3cm')],
- [17, Bands::get_freq('12mm')],
- [18, Bands::get_freq('6cm')],
+ [12, Bands::get_freq('220')],
+ [13, Bands::get_freq('70cm')],
+ [14, Bands::get_freq('23cm')],
+ [15, Bands::get_freq('13cm')],
+ [16, Bands::get_freq('9cm')],
+ [17, Bands::get_freq('6cm')],
+ [18, Bands::get_freq('3cm')],
+ [19, Bands::get_freq('12mm')],
+ [20, Bands::get_freq('6cm')],
);
my %list;
my @tot;
for ($i = 0; $i < @freq+2; $i++) {
$tot[$i] ||= 0;
}
- $out->write(join('^', 'TOTALS', @tot) . "\n");
+ $statp->write($date, join('^', 'TOTALS', @tot));
for (sort {$list{$b}->[0] <=> $list{$a}->[0]} keys %list) {
my $ref = $list{$_};
for ($i = 0; $i < @freq+2; ++$i) {
$ref->[$i] ||= 0;
}
- $out->write(join('^', $call, @$ref) . "\n");
+ $statp->write($date, join('^', $call, @$ref));
}
- $out->close;
+ $statp->close;
}
}