add country names to the end of the Ve7cc dx spots string

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 48206cea6b4cce0a861b4dcc775b3e5789bdefa8..9ec6edda05a51e055e8d7e710e8f9fac7f5d3dbf 100644 (file)
--- 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 43390fb943341472735a0f599d20d73ab3f8aa60..2679ff1e4e2f39dda68d71821c6e9a8faa9fb65b 100644 (file)
--- 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;