X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fqrz.pl;h=9a3f9c3fc93ed9dd334b64ac259c7e271ac7ae14;hb=99077d96c91df307092394bf1028212adeec4c37;hp=e0ee31a6c7bf27a150b36c0061877e556b602b37;hpb=47383bebd8106d9d38db00eac42a05a233aa609e;p=spider.git

diff --git a/cmd/show/qrz.pl b/cmd/show/qrz.pl
index e0ee31a6..9a3f9c3f 100644
--- a/cmd/show/qrz.pl
+++ b/cmd/show/qrz.pl
@@ -2,10 +2,9 @@
 # Query the QRZ Database server for a callsign
 #
 # from an idea by Steve Franke K9AN and information from Angel EA7WA
+# and finally (!) modified to use the XML interface
 #
-# Copyright (c) 2001 Dirk Koopman G1TLH
-#
-#
+# Copyright (c) 2001-2009 Dirk Koopman G1TLH
 #
 my ($self, $line) = @_;
 my @list = split /\s+/, $line;		      # generate a list of callsigns
@@ -15,14 +14,10 @@ my @out;
 
 return (1, $self->msg('e24')) unless $Internet::allow;
 return (1, "SHOW/QRZ <callsign>, e.g. SH/QRZ g1tlh") unless @list;
-#my $target = $Internet::http_proxy || 'www.qrz.com';
-#my $port = $Internet::http_proxy_port || 80;
-#my $url = '';
-#$url = 'http://www.qrz.com' if $Internet::http_proxy; 
-my $target = $Internet::http_proxy || $Internet::qrz_url || 'www.qrz.com';
+my $target = $Internet::http_proxy || $Internet::qrz_url || 'xml.qrz.com';
 my $port = $Internet::http_proxy_port || 80;
 my $url = '';
-$url = 'http://' . ($Internet::qrz_url | 'www.qrz.com') if $Internet::http_proxy;
+$url = 'http://' . ($Internet::qrz_url | 'xml.qrz.com') if $Internet::http_proxy;
 
 
 use Net::Telnet;
@@ -39,7 +34,7 @@ foreach $l (@list) {
 	if (!$t || $@) {
 		push @out, $self->msg('e18', 'QRZ.com');
 	} else {
-		my $s = "GET $url/p/dxcluster.pl?callsign=$l\&username=$Internet::qrz_uid\&password=$Internet::qrz_pw HTTP/1.0\n\n";
+		my $s = "GET /xml?callsign=$l;username=$Internet::qrz_uid;password=$Internet::qrz_pw;agent=dxspider HTTP/1.0\n\n";
 		dbg($s) if isdbg('qrz');
 		$t->print($s);
 		Log('call', "$call: show/qrz \U$l");
@@ -50,12 +45,17 @@ foreach $l (@list) {
 				push @out, $self->msg('e18', 'QRZ.com');
 				last;
 			}
-			if ($state eq 'blank' && $result =~ /^\s*Callsign\s*:/i) {
+			if ($state eq 'blank' && $result =~ /^<Callsign>/i) {
 				$state = 'go';
 			} elsif ($state eq 'go') {
-				next if $result =~ /^\s*Usage\s*:/i;
-				chomp $result;
-				push @out, $result;
+				next if $result =~ m|<user>|;
+				next if $result =~ m|<u_views>|;
+				next if $result =~ m|<locref>|;
+				next if $result =~ m|<ccode>|;
+				next if $result =~ m|<dxcc>|;
+				last if $result =~ m|</Callsign>|;
+				my ($tag, $data) = $result =~ m|^\s*<(\w+)>(.*)</|;
+				push @out, sprintf "%10s: $data", $tag;
 			}
 		}
 		$t->close;