X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fqrz.pl;h=b9d70441ea955d0928f071a5a3c8cb342af7c8c9;hb=cc83de0d5705ea91c54f5a3472045594f615d7d7;hp=0d6e2d487d0bf7ab4f572b63b6a3911c817cf328;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git

diff --git a/cmd/show/qrz.pl b/cmd/show/qrz.pl
index 0d6e2d48..b9d70441 100644
--- a/cmd/show/qrz.pl
+++ b/cmd/show/qrz.pl
@@ -2,51 +2,76 @@
 # 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
 #
-# $Id$
+# Then made asyncronous...
 #
-my ($self, $line) = @_;
-my @list = split /\s+/, $line;		      # generate a list of callsigns
-my $l;
-my $call = $self->call;
-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 || 'qrz.com';
-my $port = $Internet::http_proxy_port || 80;
-my $url = '';
-$url = 'http://qrz.com' if $Internet::http_proxy; 
-
-use Net::Telnet;
-
-my $t = new Net::Telnet;
-
-foreach $l (@list) {
-	$t->open(Host     =>  $target,
-			 Port     =>  $port,
-			 Timeout  =>  15);
-	if ($t) {
-		my $s = "GET $url/dxcluster.cgi?callsign=$l\&uid=$Internet::qrz_uid\&pw=$Internet::qrz_pw HTTP/1.0\n\n";
-#		print $s;
-		$t->print($s);
-		Log('call', "$call: show/qrz \U$l");
-		my $state = "blank";
-		while (my $result = $t->getline) {
-			dbg($result) if isdbg('qrz');
-			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;
-			}
+# Copyright (c) 2001-2013 Dirk Koopman G1TLH
+#
+
+sub _send
+{
+	my $conn = shift;
+	my $msg = shift;
+	my $dxchan = shift;
+
+	my ($tag, $data) = $msg =~ m|^\s*<(\w+)>(.*)</|;
+	my $prefix = $conn->{prefix} || ' ';
+	$dxchan->send($prefix . sprintf("%-10s: $data", $tag));
+}
+
+sub filter
+{
+	my $conn = shift;
+	my $msg = shift;
+	my $dxchan = shift;
+
+	my $state = $conn->{state};
+	
+	dbg("qrz: $state $msg") if isdbg('qrz');
+
+	if ($state eq 'blank') { 
+		if ($msg =~ /^<Callsign>/) {
+			$conn->{state} = 'go';
+		} elsif ($msg =~ /^<Error>/) {
+			_send($conn, $msg, $dxchan);
+		}
+	} elsif ($state eq 'go') {
+		return if $msg =~ m|<user>|;
+		return if $msg =~ m|<u_views>|;
+		return if $msg =~ m|<locref>|;
+		return if $msg =~ m|<ccode>|;
+		return if $msg =~ m|<dxcc>|;
+	    if ($msg =~ m|</Callsign>|) {
+			$conn->{state} = 'skip';
+			return;
 		}
-		$t->close;
-		push @out, $self->msg('e3', 'qrz.com', uc $l) unless @out;
+#		$DB::single = 1;
+		_send($conn, $msg, $dxchan);
+	}
+}
+
+sub handle
+{
+	my ($self, $line) = @_;
+	my $call = $self->call;
+	my @out;
+
+	return (1, $self->msg('e24')) unless $Internet::allow;
+	return (1, "SHOW/QRZ <callsign>, e.g. SH/QRZ g1tlh") unless $line;
+	my $target = $Internet::qrz_url || 'xml.qrz.com';
+	my $port = 80;
+	my $path = qq{/xml?callsign=$line;username=$Internet::qrz_uid;password=$Internet::qrz_pw;agent=dxspider};
+	dbg("qrz: $path") if isdbg('qrz');
+
+	Log('call', "$call: show/qrz \U$line");
+	my $conn = AsyncMsg->get($self, $target, $port, $path, filter=>\&filter, prefix=>'qrz> ');
+	if ($conn) {
+		$conn->{state} = 'blank';
+		push @out, $self->msg('m21', "show/qrz");
 	} else {
 		push @out, $self->msg('e18', 'QRZ.com');
 	}
-}
 
-return (1, @out);
+	return (1, @out);
+}