X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=c63e063f68f6352dd170ea1bfed15a00059bac11;hb=775fd16897916dccc374098ba6130b0f8858b636;hp=675fb8d0fa14c830f2890aa4399ff60e031db60b;hpb=d07b38eed1044b3b88876a53b8e5870386f38a20;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 675fb8d0..c63e063f 100644
--- 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;
@@ -122,9 +122,10 @@ if ($info) {
 if ($spotter) {
 	$expr .= " && " if $expr;
 	$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