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;
-use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots );
+main::mkver($VERSION = q$Revision$);
+
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth );
$fp = undef;
$statp = undef;
-$maxspots = 100; # 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
+$maxdays = 100; # normal maximum no of days to go back
$dirprefix = "spots";
$duplth = 20; # the length of text to use in the deduping
-$dupage = 3*3600; # the length of time to hold spot dups
+$dupage = 3600; # the length of time to hold spot dups
+$maxcalllth = 12; # the maximum call lth
+
$filterdef = bless ([
# tag, sort, field, priv, special parser
['freq', 'r', 0, 0, \&decodefreq],
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
$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]);
sub add
{
- my $buf = join("\^", @_);
+ my $buf = join('^', @_);
$fp->writeunix($_[2], $buf);
$totalspots++;
if ($_[0] <= 30000) {
# 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;
}
#
$d = int ($d / 60);
$d *= 60;
+ $by =~ s/-\d+$//g;
+
$freq = sprintf "%.1f", $freq; # normalise frequency
- $call = substr($call, 0, 12) if length $call > 12;
+ $call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
- # quick test now for simple case
- my $sdupkey = "X$freq|$call|$d|$by";
- return 1 if DXDupe::find($sdupkey);
-
chomp $text;
$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
+ $text = unpad($text);
$text = substr($text, 0, $duplth) if length $text > $duplth;
- unpad($text);
$text = pack("C*", map {$_ & 127} unpack("C*", $text));
$text =~ s/[^a-zA-Z0-9]//g;
- for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
- my $dt = $d - $_;
- my $ldupkey = "X$freq|$call|$dt|\L$text";
- my $sdupkey = "X$freq|$call|$dt|$by";
- return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey);
- }
- my $ldupkey = "X$freq|$call|$d|\L$text";
- $sdupkey = "X$freq|$call|$d|$by";
+ my $ldupkey = "X$freq|$call|$by|" . uc $text;
+ my $t = DXDupe::find($ldupkey);
+ return 1 if $t && $t - $main::systime > 0;
DXDupe::add($ldupkey, $main::systime+$dupage);
- DXDupe::add($sdupkey, $main::systime+$dupage);
+# my $sdupkey = "X$freq|$call|$by";
+# $t = DXDupe::find($sdupkey);
+# return 1 if $t && $t - $main::systime > 0;
+# DXDupe::add($sdupkey, $main::systime+$dupage);
return 0;
}