X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fqrz.pl;h=1bcd834787455f97aaffd6095eb2f2b480ea85a3;hb=b8c9c3d07fcf1229a9da44b5b11fc94dccd8d05c;hp=9a7d921fd6403268c6999e4932710c1ef99ff791;hpb=4ae3641339d8511e0b458bc6eacd287339c70cb2;p=spider.git

diff --git a/cmd/show/qrz.pl b/cmd/show/qrz.pl
index 9a7d921f..1bcd8347 100644
--- a/cmd/show/qrz.pl
+++ b/cmd/show/qrz.pl
@@ -9,9 +9,10 @@
 # Copyright (c) 2001-2013 Dirk Koopman G1TLH
 #
 
-use vars qw (%allowed);
+use vars qw (%allowed %convert);
 
-%allowed = qw(call 1 fname 1 name 1 addr2 1 state 1 country 1 lat 1 lon 1 county 1 moddate 1 qslmgr 1 grid 1 Error 1 );
+%allowed = qw(call 1 fname 1 name 1 addr2 1 state 1 country 1 lat 1 lon 1 county 1 moddate 1 qslmgr 1 grid 1 Error 1 dxcc 1 );
+%convert = qw(dxcc ADIF);
 
 sub _send
 {
@@ -21,6 +22,7 @@ sub _send
 
 	my ($tag, $data) = $msg =~ m|^\s*<(\w+)>(.*)</|;
 	if ($allowed{$tag}) {
+		$tag = $convert{$tag} if exists $convert{$tag};
 		my $prefix = $conn->{prefix} || ' ';
 		$dxchan->send($prefix . sprintf("%-10s: $data", $tag));
 	}
@@ -71,8 +73,8 @@ sub handle
 	my $port = 80;
 	my $path = qq{/xml/current/?callsign=$line;username=$Internet::qrz_uid;password=$Internet::qrz_pw;agent=dxspider};
 	dbg("qrz: $target:$port$path") if isdbg('qrz');
-
-	Log('call', "$call: show/qrz \U$line");
+	my $addr = $self->hostname || '127.0.0.1';
+	Log('cmd', "$self->{call}|$addr|show/qrz|$line");
 	my $conn = AsyncMsg->get($self, $target, $path, filter=>\&filter, prefix=>'qrz> ', on_disc=>\&_on_disc);
 	if ($conn) {
 		$conn->{state} = 'blank';