From d7c0e5450bfc963d1adb291611dd5b3664f9069d Mon Sep 17 00:00:00 2001 From: minima Date: Fri, 17 Dec 2004 12:25:09 +0000 Subject: [PATCH] add country names to the end of the Ve7cc dx spots string --- perl/Prefix.pm | 2 +- perl/VE7CC.pm | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/perl/Prefix.pm b/perl/Prefix.pm index 48206cea..9ec6edda 100644 --- a/perl/Prefix.pm +++ b/perl/Prefix.pm @@ -481,7 +481,7 @@ sub cty_data my @dxcc = extract($call); if (@dxcc) { - return ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, ($dxcc[1]->state||''), ($dxcc[1]->city||'')); + return ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, ($dxcc[1]->state||''), ($dxcc[1]->city||''), ($dxcc[1]->name||'')); } return (666,0,0,'',''); } diff --git a/perl/VE7CC.pm b/perl/VE7CC.pm index 43390fb9..2679ff1e 100644 --- a/perl/VE7CC.pm +++ b/perl/VE7CC.pm @@ -34,7 +34,10 @@ sub dx_spot # remove interface callsign; pop; - return sprintf("CC11^%0.1f^%s^", $freq, $spotted) . join('^', cldate($t), ztime($t), @_); + my $spotted_cc = (Prefix::cty_data($spotted))[5]; + my $spotter_cc = (Prefix::cty_data($_[1]))[5]; + + return sprintf("CC11^%0.1f^%s^", $freq, $spotted) . join('^', cldate($t), ztime($t), @_, $spotter_cc, $spotted_cc); } 1; -- 2.43.0