fix sh/mydx, add back qra sq for sh/dxgrid

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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 6a9a3829a3a7a79f5878034703edd9a7bfb2959d..baca1f68fe2cfcb5a924a07eac739d09eebaddb3 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -50,7 +50,8 @@ sub handle
                        next if $from && $to > $from;
                }
                if ($f && !$to) {
-                       ($to) = $f =~ /^(\d+)$/o || 0 if !$to; # is it a to count?
+                       ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
+                       $to ||= 0;
                        dbg("sh/dx to: $to") if isdbg('sh/dx');
                        next if $to;
                }
@@ -79,6 +80,22 @@ sub handle
                        push @flist, "info {QSL|VIA}";
                        next;
                }
+               if (lc $f eq '<es>') {
+                       dbg("sh/dx <es>") if isdbg('sh/dx');
+                       push @flist, "info {<ES>}";
+                       next;
+               }
+               if (lc $f eq '<tr>') {
+                       dbg("sh/dx <es>") if isdbg('sh/dx');
+                       push @flist, "info {<TR>}";
+                       next;
+               }
+               if (lc $f eq '<ms>') {
+                       dbg("sh/dx <ms>") if isdbg('sh/dx');
+                       push @flist, "info {<ms>}";
+                       next;
+               }
+
                if (lc $f eq 'iota') {
                        my $doiota;
                        if (@list && $list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)[-\s]?(\d\d?\d?)/i)) {
@@ -142,6 +159,7 @@ sub handle
        return (0, "sh/dx parse error '$r' " . $filter) if $r;
 
        $user ||= '';
+       $expr ||= '';
        dbg "sh/dx user: $user expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx');
   
        # now do the search