X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=fecf16fc1dfdeebf69f62fc6555d9e6a0e525e2b;hb=1444521e066e02651bcb1827ae0ea643b4728b44;hp=d52826dff67ed4b3dc4e16ebdb6d17f8767fcdfa;hpb=f3688be5d3f50cccf204d3d01dcaca1e9db7d4f7;p=spider.git diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl index d52826df..fecf16fc 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; while ($f = shift @list) { # next field # print "f: $f list: ", join(',', @list), "\n"; @@ -56,6 +57,10 @@ while ($f = shift @list) { # next field $spotter = uc shift @list; next; } + if (lc $f eq 'qsl') { + $doqsl = 1; + next; + } if (!$pre) { $pre = uc $f; } @@ -85,7 +90,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 +101,12 @@ if ($spotter) { $expr .= "\$f4 =~ m{$spotter}o"; } +# qsl requests +if ($doqsl) { + $expr .= " && " if $expr; + $expr .= "\$f3 =~ m{(QSL|VIA)}io"; +} + #print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n"; # now do the search