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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index d52826df..a70ef50f 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -18,6 +18,7 @@ my $pre;
 my $spotter;
 my $info;
 my $expr;
+my ($doqsl, $doiota, $doqra);
 
 while ($f = shift @list) {		# next field
 	#  print "f: $f list: ", join(',', @list), "\n";
@@ -56,6 +57,27 @@ while ($f = shift @list) {		# next field
 		$spotter = uc shift @list;
 		next;
 	}
+	if (lc $f eq 'qsl') {
+		$doqsl = 1;
+		next;
+	}
+	if (lc $f eq 'iota') {
+		my ($a, $b);
+#		$DB::single =1;
+		
+		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;
+		next;
+	}
+	if (lc $f eq 'qra') {
+		$doqra = uc shift @list if $list[0] =~ /[A-Z][A-Z]\d\d/oi;
+		$doqra = '\b([A-Z][A-Z]\d\d|[A-Z][A-Z]\d\d[A-Z][A-Z])\b' unless $doqra;
+		next;
+	}
 	if (!$pre) {
 		$pre = uc $f;
 	}
@@ -85,7 +107,7 @@ if (@freq) {
 # any info
 if ($info) {
 	$expr .= " && " if $expr;
-	$info = shellregex($info);
+	$info =~ s{(.)}{"\Q$1"}ge;
 	$expr .= "\$f3 =~ m{$info}io";
 }
 
@@ -96,6 +118,24 @@ if ($spotter) {
 	$expr .= "\$f4 =~ m{$spotter}o";
 }
 
+# qsl requests
+if ($doqsl) {
+	$expr .= " && " if $expr;
+	$expr .= "\$f3 =~ m{(QSL|VIA)}io";
+}
+
+# iota requests
+if ($doiota) {
+	$expr .= " && " if $expr;
+	$expr .= "\$f3 =~ m{$doiota}io";
+}
+
+# iota requests
+if ($doqra) {
+	$expr .= " && " if $expr;
+	$expr .= "\$f3 =~ m{$doqra}io";
+}
+
 #print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
   
 # now do the search