now with async sh/qrz!

[spider.git] / cmd / show / qrz.pl

diff --git a/cmd/show/qrz.pl b/cmd/show/qrz.pl
index 7122992f6d91c79c3f7d5f8df3cae1c2928a1158..a5d14138c38a0a791e909801c181ac3c683cbcf0 100644 (file)
--- 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
-#
-# $Id$
+# Copyright (c) 2001-2009 Dirk Koopman G1TLH
 #
 my ($self, $line) = @_;
 my @list = split /\s+/, $line;               # generate a list of callsigns
@@ -15,47 +14,57 @@ 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 $target = $Internet::http_proxy || $Internet::qrz_url || 'xml.qrz.com';
 my $port = $Internet::http_proxy_port || 80;
 my $url = '';
-$url = 'http://www.qrz.com' if $Internet::http_proxy; 
-
-use Net::Telnet;
-
-my $t = new Net::Telnet;
+$url = 'http://' . ($Internet::qrz_url || 'xml.qrz.com') if $Internet::http_proxy;
 
 foreach $l (@list) {
-       eval {
-               $t->open(Host     =>  $target,
-                                Port     =>  $port,
-                                Timeout  =>  15);
-       };
 
-       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";
-               dbg($s) if isdbg('qrz');
-               $t->print($s);
-               Log('call', "$call: show/qrz \U$l");
-               my $state = "blank";
-               while (my $result = eval { $t->getline(Timeout => 30) } || $@) {
-                       dbg($result) if isdbg('qrz') && $result;
-                       if ($@) {
-                               push @out, $self->msg('e18', 'QRZ.com');
-                               last;
-                       }
-                       if ($state eq 'blank' && $result =~ /^\s*Callsign\s*:/i) {
-                               $state = 'go';
-                       } elsif ($state eq 'go') {
-                               next if $result =~ /^\s*Usage\s*:/i;
-                               chomp $result;
-                               push @out, $result;
-                       }
-               }
-               $t->close;
-               push @out, $self->msg('e3', 'qrz.com', uc $l) unless @out;
+       my $host = $url?$url:$target;
+       my $s = "$url/xml?callsign=$l;username=$Internet::qrz_uid;password=$Internet::qrz_pw;agent=dxspider";
+       if (isdbg('qrz')) {
+               dbg("qrz: $host");
+               dbg("qrz: $s");
        }
+
+       Log('call', "$call: show/qrz \U$l");
+       push @out,  $self->msg('http1', "show/qrz \U$l");
+
+       $self->http_get($host, $s, sub
+                                       {
+                                               my ($response, $header, $body) = @_;
+                                               my @out;
+
+                                               if (isdbg('qrz')) {
+                                                       dbg("qrz response: $response");
+                                                       dbg("qrz body: $body");
+                                               }
+                                               Log('call', "$call: show/qrz \U$body");
+                                               my $state = "blank";
+                                               foreach my $result (split /\r?\n/, $body) {
+                                                       dbg("qrz: $result") if isdbg('qrz') && $result;
+                                                       if ($state eq 'blank' && $result =~ /^<Callsign>/i) {
+                                                               $state = 'go';
+                                                       } elsif ($state eq 'go') {
+                                                               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;
+                                                       }
+                                               }
+                                               if (@out) {
+                                                       unshift @out, $self->msg('http2', "show/qrz \U$l");
+                                               } else {
+                                                       push @out, $self->msg('e3', 'show/qrz', uc $l);
+                                               }
+                                               $self->send_ans(@out);
+                                       }
+                                  );
 }
 
 return (1, @out);