modified sh/qrz a bit to cope with slow server

make 's' -> send not save

diff --git a/TODO b/TODO
index ebcf58a9eda2b8d4513e561e02f552eef79add66..1a5b9021cef5fbd047fb03274ea0fa98a3ac72d6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,6 +10,10 @@ Maintenance and Enhancements
 * sh/maxusers (max users in node since last restart)
 * review badwords
 * fix non-english apropos to only show english when there REALLY is nothing else
+* cmd for callbook server ab6qv.qnet.com 1235 (non-us calls only)
+* write a parallel event driven system for helper routines
+* handle distros in announces
+* check set/homenode et al input for proper callsigns
 
 New Protocol Stuff
 ------------------

diff --git a/cmd/Aliases b/cmd/Aliases
index 2bedd5dca5fd872e1f3fc68864856df90a983e66..d2a3c93ed89b55c092f61d1c31ffd817cae3e884 100644 (file)
--- a/cmd/Aliases
+++ b/cmd/Aliases
@@ -99,6 +99,7 @@ package CmdAlias;
          '^rcmd/(\S+)', 'rcmd $1', 'rcmd',
        ],
        's' => [
+         '^s$', 'send', 'send',
          '^s/p$', 'send', 'send',
          '^sb$', 'send noprivate', 'send',
          '^set/home$', 'set/homenode', 'set/homenode',

diff --git a/cmd/show/qrz.pl b/cmd/show/qrz.pl
index 0d6e2d487d0bf7ab4f572b63b6a3911c817cf328..7665f08c9c67a646235b475f9097a5747d27f4c3 100644 (file)
--- 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');
        }
 }