fix sh/425

diff --git a/cmd/Aliases b/cmd/Aliases
index 25b87e40652134fdb503fd44a70fb62744a53153..6656c67b6782be74167f39abacb6e26b4e54cf7c 100644 (file)
--- a/cmd/Aliases
+++ b/cmd/Aliases
@@ -131,7 +131,11 @@ package CmdAlias;
          '^sho?w?/myd?x?/(\d+)-(\d+)', 'show/dx filter $1-$2', 'show/mydx',
          '^sho?w?/myd?x?/(\d+)', 'show/dx filter $1', 'show/mydx',
          '^sho?w?/myd?x?/d(\d+)', 'show/dx filter from $1', 'show/mydx',
-         '^sho?w?/myd?x?', 'show/dx filter', 'show/mydx',
+         '^sho?w?/myd?x?', 'show/dx filter real', 'show/mydx',
+         '^sho?w?/myfd?x?/(\d+)-(\d+)', 'show/dx filter real $1-$2', 'show/mydx',
+         '^sho?w?/myfd?x?/(\d+)', 'show/dx filter real $1', 'show/mydx',
+         '^sho?w?/myfd?x?/d(\d+)', 'show/dx filter real from $1', 'show/mydx',
+         '^sho?w?/myfd?x?', 'show/dx filter real', 'show/mydx',
          '^sho?w?/newco?n?\w*/n', 'show/newconfiguration node', 'show/newconfiguration',
          '^sho?w?/sta?$', 'show/station', 'show/station',
          '^sho?w?/tnc', 'who', 'who',

diff --git a/cmd/show/425.pl b/cmd/show/425.pl
index 44ad0a30b89f7eb6a2d8df12ec22c9e73b40fdd0..c825b91bded67e6e7c8f1e7e6d4799dcc10e6e4b 100644 (file)
--- a/cmd/show/425.pl
+++ b/cmd/show/425.pl
@@ -38,7 +38,7 @@ if (!$t || $@) {
         else {
                 $op="op=search&query=".$list[0];
         }
-        my $s = "GET $url/hf/dx-news/iz5fsa/spider.php?$op HTTP/1.0\n"
+       my $s = "GET $url/hf/dx-news/spider.php?$op HTTP/1.0\n" 
         ."User-Agent:DxSpider;$main::version;$main::build;$^O;$main::mycall;$call;$list[0]\n\n";
         dbg($s) if isdbg('425');
         $t->print($s);

diff --git a/perl/convkeps.pl b/perl/convkeps.pl
index a7f3e0ae8ec53753dd0b6180027c4211d7a38bc2..9fda8e820dcaa6f0b36a2f64f606594ec6610af8 100755 (executable)
--- a/perl/convkeps.pl
+++ b/perl/convkeps.pl
@@ -61,6 +61,14 @@ my $ref;
 my $line;
 my $count = 0;
 
+my %lookup = (
+       'AO-5' => 'AO-05',
+       'AO-6' => 'AO-06',
+       'AO-7' => 'AO-07',
+       'AO-8' => 'AO-08',
+       
+);
+
 my $f = \*STDIN;
 
 while (@ARGV) {
@@ -96,9 +104,11 @@ while (<$f>) {
                last if m{^-};
                next if m{^To\s+all}i;
                
-               if (/^[- \w]+$/) {
-                       s/\s/-/g;
-                       $name = uc $_;
+               if (/^([- \w]+)(?:\s+\[[-+\w]\])?$/) {
+                       my $n = uc $1;
+                       $n =~ s/\s/-/g;
+                       $name = $lookup{$n};
+                       $name ||= $n;
                        $ref = $keps{$name} = {}; 
                        $state = 2;
                }