projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix !( spurious && before next item in Filter
[spider.git]
/
cmd
/
show
/
qrz.pl
diff --git
a/cmd/show/qrz.pl
b/cmd/show/qrz.pl
index 3e928f5874c58c57558ce51c1be4104899a0f80c..5863767ea12c9e9cf469748e778fe9534042c991 100644
(file)
--- a/
cmd/show/qrz.pl
+++ b/
cmd/show/qrz.pl
@@
-9,9
+9,10
@@
# Copyright (c) 2001-2013 Dirk Koopman G1TLH
#
# Copyright (c) 2001-2013 Dirk Koopman G1TLH
#
-use vars qw (%allowed);
+use vars qw (%allowed
%convert
);
-%allowed = qw(call 1 fname 1 name 1 addr2 1 state 1 country 1 lat 1 lon 1 county 1 moddate 1 qslmgr 1 grid 1 );
+%allowed = qw(call 1 fname 1 name 1 addr2 1 state 1 country 1 lat 1 lon 1 county 1 moddate 1 qslmgr 1 grid 1 Error 1 dxcc 1 );
+%convert = qw(dxcc ADIF);
sub _send
{
sub _send
{
@@
-21,6
+22,7
@@
sub _send
my ($tag, $data) = $msg =~ m|^\s*<(\w+)>(.*)</|;
if ($allowed{$tag}) {
my ($tag, $data) = $msg =~ m|^\s*<(\w+)>(.*)</|;
if ($allowed{$tag}) {
+ $tag = $convert{$tag} if exists $convert{$tag};
my $prefix = $conn->{prefix} || ' ';
$dxchan->send($prefix . sprintf("%-10s: $data", $tag));
}
my $prefix = $conn->{prefix} || ' ';
$dxchan->send($prefix . sprintf("%-10s: $data", $tag));
}
@@
-44,9
+46,9
@@
sub filter
dbg("qrz: $state $msg") if isdbg('qrz');
if ($state eq 'blank') {
dbg("qrz: $state $msg") if isdbg('qrz');
if ($state eq 'blank') {
- if ($msg =~ /^<Callsign>/) {
+ if ($msg =~ /^
\s*
<Callsign>/) {
$conn->{state} = 'go';
$conn->{state} = 'go';
- } elsif ($msg =~ /^<Error>/) {
+ } elsif ($msg =~ /^
\s*
<Error>/) {
_send($conn, $msg, $dxchan);
}
} elsif ($state eq 'go') {
_send($conn, $msg, $dxchan);
}
} elsif ($state eq 'go') {
@@
-67,13
+69,13
@@
sub handle
return (1, $self->msg('e24')) unless $Internet::allow;
return (1, "SHOW/QRZ <callsign>, e.g. SH/QRZ g1tlh") unless $line;
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
data
.qrz.com';
+ my $target = $Internet::qrz_url || 'xml.qrz.com';
my $port = 80;
my $path = qq{/xml/current/?callsign=$line;username=$Internet::qrz_uid;password=$Internet::qrz_pw;agent=dxspider};
my $port = 80;
my $path = qq{/xml/current/?callsign=$line;username=$Internet::qrz_uid;password=$Internet::qrz_pw;agent=dxspider};
- dbg("qrz: $path") if isdbg('qrz');
+ dbg("qrz: $
target:$port$
path") if isdbg('qrz');
Log('call', "$call: show/qrz \U$line");
Log('call', "$call: show/qrz \U$line");
- my $conn = AsyncMsg->get($self, $target, $p
ort, $p
ath, filter=>\&filter, prefix=>'qrz> ', on_disc=>\&_on_disc);
+ my $conn = AsyncMsg->get($self, $target, $path, filter=>\&filter, prefix=>'qrz> ', on_disc=>\&_on_disc);
if ($conn) {
$conn->{state} = 'blank';
push @out, $self->msg('m21', "show/qrz");
if ($conn) {
$conn->{state} = 'blank';
push @out, $self->msg('m21', "show/qrz");