use DXUtil;
use Julian;
use Prefix;
+use DXUser;
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;
-
sub dx_spot
{
my $self = shift; # this may be useful some day
my $freq = shift;
my $spotted = shift;
my $t = shift;
+ my $loc_spotted = '';
+ my $loc_spotter = '';
+ my $ref = DXUser->get_current($spotted);
+ if ($ref) {
+ my $loc = $ref->qra || '';
+ $loc_spotted =substr($loc, 0, 4) if $loc;
+ }
+
+ # remove any items above the top of the max spot data
+ pop while @_ > 11;
- # remove interface callsign;
- pop;
+ # make sure both US states are defined
+ $_[9] ||= '';
+ $_[10] ||= '';
my $spotted_cc = (Prefix::cty_data($spotted))[5];
my $spotter_cc = (Prefix::cty_data($_[1]))[5];
+ $ref = DXUser->get_current($_[1]);
+ if ($ref) {
+ my $loc = $ref->qra || '';
+ $loc_spotter = substr($loc, 0, 4) if $loc;
+ }
- return sprintf("CC11^%0.1f^%s^", $freq, $spotted) . join('^', cldate($t), ztime($t), @_, $spotter_cc, $spotted_cc);
+ return sprintf("CC11^%0.1f^%s^", $freq, $spotted) . join('^', cldate($t), ztime($t), @_, $spotted_cc, $spotter_cc, $loc_spotted, $loc_spotter);
}
1;