projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log all incoming rcmd regardless of outcome
[spider.git]
/
cmd
/
show
/
qrz.pl
diff --git
a/cmd/show/qrz.pl
b/cmd/show/qrz.pl
index b9d70441ea955d0928f071a5a3c8cb342af7c8c9..5863767ea12c9e9cf469748e778fe9534042c991 100644
(file)
--- a/
cmd/show/qrz.pl
+++ b/
cmd/show/qrz.pl
@@
-9,6
+9,11
@@
# Copyright (c) 2001-2013 Dirk Koopman G1TLH
#
# Copyright (c) 2001-2013 Dirk Koopman G1TLH
#
+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 Error 1 dxcc 1 );
+%convert = qw(dxcc ADIF);
+
sub _send
{
my $conn = shift;
sub _send
{
my $conn = shift;
@@
-16,8
+21,18
@@
sub _send
my $dxchan = shift;
my ($tag, $data) = $msg =~ m|^\s*<(\w+)>(.*)</|;
my $dxchan = shift;
my ($tag, $data) = $msg =~ m|^\s*<(\w+)>(.*)</|;
- my $prefix = $conn->{prefix} || ' ';
- $dxchan->send($prefix . sprintf("%-10s: $data", $tag));
+ if ($allowed{$tag}) {
+ $tag = $convert{$tag} if exists $convert{$tag};
+ my $prefix = $conn->{prefix} || ' ';
+ $dxchan->send($prefix . sprintf("%-10s: $data", $tag));
+ }
+}
+
+sub _on_disc
+{
+ my $conn = shift;
+ my $dxchan = shift;
+ $dxchan->send("Data provided by www.qrz.com");
}
sub filter
}
sub filter
@@
-31,17
+46,12
@@
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') {
- 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;
if ($msg =~ m|</Callsign>|) {
$conn->{state} = 'skip';
return;
@@
-61,11
+71,11
@@
sub handle
return (1, "SHOW/QRZ <callsign>, e.g. SH/QRZ g1tlh") unless $line;
my $target = $Internet::qrz_url || 'xml.qrz.com';
my $port = 80;
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');
+ my $path = qq{/xml
/current/
?callsign=$line;username=$Internet::qrz_uid;password=$Internet::qrz_pw;agent=dxspider};
+ 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, $path, filter=>\&filter, prefix=>'qrz> '
);
+ my $conn = AsyncMsg->get($self, $target, $p
ath, 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");