use Net::Telnet;
use QSL;
use DB_File;
+use VE7CC;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
my $self = shift;
my $t = ztime($_[2]);
- my $loc;
+ my $loc = '';
my $clth = $self->{consort} eq 'local' ? 29 : 30;
my $comment = substr $_[3], 0, $clth;
$comment .= ' ' x ($clth - length($comment));
- my $ref = DXUser->get_current($_[4]);
- if ($ref) {
- $loc = $ref->qra || '' if $self->{user}->wantgrid;
- $loc = ' ' . substr($loc, 0, 4) if $loc;
- }
- $loc = "" unless $loc;
+ if ($self->{user}->wantgrid) {
+ my $ref = DXUser->get_current($_[4]);
+ if ($ref) {
+ $loc = $ref->qra || '';
+ $loc = ' ' . substr($loc, 0, 4) if $loc;
+ }
+ }
if ($self->{user}->wantdxitu) {
$loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
my $self = shift;
my $line = shift;
my $isolate = shift;
+ return unless $self->{dx};
+
my ($filter, $hops);
- return unless $self->{dx};
-
if ($self->{spotsfilter}) {
($filter, $hops) = $self->{spotsfilter}->it(@_ );
return unless $filter;
}
dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
-
- my $buf = $self->format_dx_spot(@_);
- $buf .= "\a\a" if $self->{beep};
- $buf =~ s/\%5E/^/g;
+
+ my $buf;
+ if ($self->{ve7cc}) {
+ $buf = VE7CC::dx_spot($self, @_);
+ } else {
+ $buf = $self->format_dx_spot(@_);
+ $buf .= "\a\a" if $self->{beep};
+ $buf =~ s/\%5E/^/g;
+ }
+
$self->local_send('X', $buf);
}