added some extra cases for IOTA and QSL detection on sh/dx

[spider.git] / cmd / show / dx.pl

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index a70ef50f66f7f2ac848eafd7e468e5e131732f2f..2af75e7ce09a21ae897bec57ee75f6424ed1e7c6 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -65,12 +65,12 @@ while ($f = shift @list) {          # next field
                my ($a, $b);
 #              $DB::single =1;
                
-               if ($list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)-?(\d\d\d)/oi)) {
+               if ($list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)-?(\d?\d\d)/oi)) {
                        $a = uc $a;
                        $doiota = "\\b$a\[\-\ \]\?$b\\b";
                        shift @list;
                }
-               $doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[- ]?\d\d\d)\b' unless $doiota;
+               $doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[- ]?\d?\d\d)\b' unless $doiota;
                next;
        }
        if (lc $f eq 'qra') {
@@ -121,7 +121,7 @@ if ($spotter) {
 # qsl requests
 if ($doqsl) {
        $expr .= " && " if $expr;
-       $expr .= "\$f3 =~ m{(QSL|VIA)}io";
+       $expr .= "\$f3 =~ m{(\@|>|QSL|VIA)}io";
 }
 
 # iota requests