From 022706c9f44ade7f23fcfa76efcdcd61c98829a7 Mon Sep 17 00:00:00 2001 From: minima Date: Mon, 20 Dec 2004 21:56:36 +0000 Subject: [PATCH] add spotted and spotter DXGrid if available --- perl/DXCommandmode.pm | 15 ++++++++------- perl/VE7CC.pm | 19 ++++++++++++++++--- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 5c3699a3..e4949857 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -829,16 +829,17 @@ sub format_dx_spot 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]; diff --git a/perl/VE7CC.pm b/perl/VE7CC.pm index e6634b62..58964c5a 100644 --- a/perl/VE7CC.pm +++ b/perl/VE7CC.pm @@ -15,6 +15,7 @@ use DXDebug; use DXUtil; use Julian; use Prefix; +use DXUser; use strict; @@ -30,6 +31,13 @@ sub dx_spot 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; @@ -38,10 +46,15 @@ sub dx_spot $_[9] ||= ''; $_[10] ||= ''; - my $spotter_cc = (Prefix::cty_data($spotted))[5]; - my $spotted_cc = (Prefix::cty_data($_[1]))[5]; + 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; -- 2.43.0