X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=3f1341ad6fd169bbbf5a8ceaee42b214fab1e945;hb=bab2cc5b932a1b57a8a81e7e815c692169da0d6c;hp=65074b83d0c5f98c01f75e877dcfd6fee9032b4f;hpb=df49d2cf8efcb2b6becf241379700f363a7014df;p=spider.git diff --git a/perl/Prefix.pm b/perl/Prefix.pm index 65074b83..3f1341ad 100644 --- a/perl/Prefix.pm +++ b/perl/Prefix.pm @@ -473,14 +473,21 @@ sub to_ciz return @out; } -# get the full country data (dxcc, itu, cq, state) as a list +# get the full country data (dxcc, itu, cq, state, city) as a list # from a callsign. sub cty_data { my $call = shift; my @dxcc = extract($call); - return @dxcc ? ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, $dxcc[1]->state) : (); + if (@dxcc) { + my $state = $dxcc[1]->state || ''; + my $city = $dxcc[1]->city || ''; + my $name = $dxcc[1]->name || ''; + + return ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, $state, $city, $name); + } + return (666,0,0,'','','Pirate-Country-QQ'); } my %valid = (