X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=cmd%2Fshow%2Fdx.pl;h=d52826dff67ed4b3dc4e16ebdb6d17f8767fcdfa;hb=f3688be5d3f50cccf204d3d01dcaca1e9db7d4f7;hp=c98699969ad095cc4518eab077ee5bf936009821;hpb=cc91428ca79b3cdfdc7733505384f5983ad6c7fa;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index c9869996..d52826df 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -63,14 +63,9 @@ while ($f = shift @list) {		# next field
 
 # first deal with the prefix
 if ($pre) {
-	$expr = "\$f1 =~ /";
-	$pre =~ s|/|\\/|;			# change the slashes to \/ 
-	if ($pre =~ /^\*/o) {
-		$pre =~ s/^\*//;;
-		$expr .= "$pre\$/o";
-	} else {
-		$expr .= "^$pre/o";
-	}
+	$pre .= '*' unless $pre =~ /[\*\?\[]/o;
+	$pre = shellregex($pre);
+	$expr = "\$f1 =~ m{$pre}o";
 } else {
 	$expr = "1";				# match anything
 }
@@ -90,15 +85,15 @@ if (@freq) {
 # any info
 if ($info) {
 	$expr .= " && " if $expr;
-	$info =~ s|/|\\/|;
-	$expr .= "\$f3 =~ /$info/io";
+	$info = shellregex($info);
+	$expr .= "\$f3 =~ m{$info}io";
 }
 
 # any spotter
 if ($spotter) {
 	$expr .= " && " if $expr;
-	$spotter =~ s|/|\\/|;
-	$expr .= "\$f4 =~ /$spotter/o";
+	$spotter = shellregex($spotter);
+	$expr .= "\$f4 =~ m{$spotter}o";
 }
 
 #print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";