X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fqrz.pl;h=7665f08c9c67a646235b475f9097a5747d27f4c3;hb=9bafb5297d126d00203d67addaa918c0f056d9a8;hp=0d6e2d487d0bf7ab4f572b63b6a3911c817cf328;hpb=e18c9b8b9a003bfb56416ab1d2aee0f232146d25;p=spider.git diff --git a/cmd/show/qrz.pl b/cmd/show/qrz.pl index 0d6e2d48..7665f08c 100644 --- a/cmd/show/qrz.pl +++ b/cmd/show/qrz.pl @@ -23,17 +23,26 @@ use Net::Telnet; my $t = new Net::Telnet; foreach $l (@list) { - $t->open(Host => $target, - Port => $port, - Timeout => 15); - if ($t) { + eval { + $t->open(Host => $target, + Port => $port, + Timeout => 15); + }; + + if (!$t || $@) { + push @out, $self->msg('e18', 'QRZ.com'); + } else { 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'); + 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') { @@ -44,8 +53,6 @@ foreach $l (@list) { } $t->close; push @out, $self->msg('e3', 'qrz.com', uc $l) unless @out; - } else { - push @out, $self->msg('e18', 'QRZ.com'); } }