projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct some english
[spider.git]
/
cmd
/
show
/
qrz.pl
diff --git
a/cmd/show/qrz.pl
b/cmd/show/qrz.pl
index 4b05c7e0a5020b6d69369d084868dd5bc9969567..0d6e2d487d0bf7ab4f572b63b6a3911c817cf328 100644
(file)
--- a/
cmd/show/qrz.pl
+++ b/
cmd/show/qrz.pl
@@
-13,23
+13,27
@@
my @out;
return (1, $self->msg('e24')) unless $Internet::allow;
return (1, "SHOW/QRZ <callsign>, e.g. SH/QRZ g1tlh") unless @list;
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) {
use Net::Telnet;
my $t = new Net::Telnet;
foreach $l (@list) {
- $t->open(Host =>
"qrz.com"
,
- Port =>
80
,
+ $t->open(Host =>
$target
,
+ Port =>
$port
,
Timeout => 15);
if ($t) {
Timeout => 15);
if ($t) {
- my $s = "GET /dxcluster.cgi?callsign=$l\&uid=$Internet::qrz_uid\&pw=$Internet::qrz_pw HTTP/1.0\n\n";
+ 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) {
# print $s;
$t->print($s);
Log('call', "$call: show/qrz \U$l");
my $state = "blank";
while (my $result = $t->getline) {
-
# print $result
;
+
dbg($result) if isdbg('qrz')
;
if ($state eq 'blank' && $result =~ /^\s*Callsign\s*:/i) {
$state = 'go';
} elsif ($state eq 'go') {
if ($state eq 'blank' && $result =~ /^\s*Callsign\s*:/i) {
$state = 'go';
} elsif ($state eq 'go') {
@@
-39,7
+43,7
@@
foreach $l (@list) {
}
}
$t->close;
}
}
$t->close;
- push @out, $self->msg('e3', 'qrz.com',
$cal
l) unless @out;
+ push @out, $self->msg('e3', 'qrz.com',
uc $
l) unless @out;
} else {
push @out, $self->msg('e18', 'QRZ.com');
}
} else {
push @out, $self->msg('e18', 'QRZ.com');
}