make sh/dx on 6m by g works

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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 675fb8d0fa14c830f2890aa4399ff60e031db60b..b2257c49b48ac04e412be931cc731f459e84174b 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -89,7 +89,7 @@ if ($pre) {
        $pre .= '*' unless $pre =~ /[\*\?\[]/o;
        $pre = shellregex($pre);
        $expr = "\$f1 =~ m{$pre}";
-       $pre =~ s/\^//;
+       $pre =~ s/[\^\$]//g;
        $hint = "m{\U$pre}";
 }
   
@@ -101,7 +101,7 @@ if (@freq) {
        for ($i = 0; $i < @freq; $i += 2) {
                $expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
                my $r = Spot::ftor($freq[$i], $freq[$i+1]);
-               $hint .= "m{$r} ||" if $r;
+               $hint .= "m{$r\\.} ||" if $r;
        }
        chop $expr;     chop $expr;
        chop $hint;     chop $hint;
@@ -121,10 +121,12 @@ if ($info) {
 # any spotter
 if ($spotter) {
        $expr .= " && " if $expr;
+       $spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
        $spotter = shellregex($spotter);
-       $expr .= "\$f4 =~ m{$spotter}";
+       $expr .= "\$f4 =~ m{\U$spotter}";
        $hint .= " && " if $hint;
-       $hint .= "m{$spotter}";
+       $spotter =~ s/[\^\$]//g;
+       $hint .= "m{\U$spotter}";
 }
 
 # qsl requests