projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index d52826dff67ed4b3dc4e16ebdb6d17f8767fcdfa..fecf16fc1dfdeebf69f62fc6555d9e6a0e525e2b 100644
(file)
--- a/
cmd/show/dx.pl
+++ b/
cmd/show/dx.pl
@@
-18,6
+18,7
@@
my $pre;
my $spotter;
my $info;
my $expr;
my $spotter;
my $info;
my $expr;
+my $doqsl;
while ($f = shift @list) { # next field
# print "f: $f list: ", join(',', @list), "\n";
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;
}
$spotter = uc shift @list;
next;
}
+ if (lc $f eq 'qsl') {
+ $doqsl = 1;
+ next;
+ }
if (!$pre) {
$pre = uc $f;
}
if (!$pre) {
$pre = uc $f;
}
@@
-85,7
+90,7
@@
if (@freq) {
# any info
if ($info) {
$expr .= " && " if $expr;
# any info
if ($info) {
$expr .= " && " if $expr;
- $info =
shellregex($info)
;
+ $info =
~ s{(.)}{"\Q$1"}ge
;
$expr .= "\$f3 =~ m{$info}io";
}
$expr .= "\$f3 =~ m{$info}io";
}
@@
-96,6
+101,12
@@
if ($spotter) {
$expr .= "\$f4 =~ m{$spotter}o";
}
$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
#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
# now do the search