projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missing set/unset wcy commands
[spider.git]
/
cmd
/
show
/
dx.pl
diff --git
a/cmd/show/dx.pl
b/cmd/show/dx.pl
index b10ee7cd61260a40e7b85b0332cbcd26b07e13b6..c63e063f68f6352dd170ea1bfed15a00059bac11 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 $hint;
my ($doqsl, $doiota, $doqra);
while ($f = shift @list) { # next field
my ($doqsl, $doiota, $doqra);
while ($f = shift @list) { # next field
@@
-87,64
+88,78
@@
while ($f = shift @list) { # next field
if ($pre) {
$pre .= '*' unless $pre =~ /[\*\?\[]/o;
$pre = shellregex($pre);
if ($pre) {
$pre .= '*' unless $pre =~ /[\*\?\[]/o;
$pre = shellregex($pre);
- $expr = "\$f1 =~ m{$pre}
o
";
-} else {
- $
expr = "1"; # match anything
+ $expr = "\$f1 =~ m{$pre}";
+ $pre =~ s/[\^\$]//g;
+ $
hint = "m{\U$pre}";
}
# now deal with any frequencies specified
if (@freq) {
$expr .= ($expr) ? " && (" : "(";
}
# now deal with any frequencies specified
if (@freq) {
$expr .= ($expr) ? " && (" : "(";
+ $hint .= ($hint) ? " && (" : "(";
my $i;
for ($i = 0; $i < @freq; $i += 2) {
$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
my $i;
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;
}
}
- chop $expr;
- chop $
expr
;
+ chop $expr;
chop $expr;
+ chop $
hint; chop $hint
;
$expr .= ")";
$expr .= ")";
+ $hint .= ")";
}
# any info
if ($info) {
$expr .= " && " if $expr;
$info =~ s{(.)}{"\Q$1"}ge;
}
# any info
if ($info) {
$expr .= " && " if $expr;
$info =~ s{(.)}{"\Q$1"}ge;
- $expr .= "\$f3 =~ m{$info}io";
+ $expr .= "\$f3 =~ m{$info}i";
+ $hint .= " && " if $hint;
+ $hint .= "m{$info}i";
}
# any spotter
if ($spotter) {
$expr .= " && " if $expr;
$spotter = shellregex($spotter);
}
# any spotter
if ($spotter) {
$expr .= " && " if $expr;
$spotter = shellregex($spotter);
- $expr .= "\$f4 =~ m{$spotter}o";
+ $expr .= "\$f4 =~ m{\U$spotter}";
+ $hint .= " && " if $hint;
+ $spotter =~ s/[\^\$]//g;
+ $hint .= "m{\U$spotter}";
}
# qsl requests
if ($doqsl) {
$expr .= " && " if $expr;
}
# qsl requests
if ($doqsl) {
$expr .= " && " if $expr;
- $expr .= "\$f3 =~ m{(\@|>|QSL|VIA)}io";
+ $expr .= "\$f3 =~ m{QSL|VIA}i";
+ $hint .= " && " if $hint;
+ $hint .= "m{QSL|VIA}i";
}
# iota requests
if ($doiota) {
$expr .= " && " if $expr;
}
# iota requests
if ($doiota) {
$expr .= " && " if $expr;
- $expr .= "\$f3 =~ m{$doiota}io";
+ $expr .= "\$f3 =~ m{$doiota}i";
+ $hint .= " && " if $hint;
+ $hint .= "m{$doiota}i";
}
# iota requests
if ($doqra) {
$expr .= " && " if $expr;
}
# iota requests
if ($doqra) {
$expr .= " && " if $expr;
- $expr .= "\$f3 =~ m{$doqra}io";
+ $expr .= "\$f3 =~ m{$doqra}i";
+ $hint .= " && " if $hint;
+ $hint .= "m{$doqra}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
-my @res = Spot::search($expr, $fromday, $today, $from, $to);
+my @res = Spot::search($expr, $fromday, $today, $from, $to
, $hint
);
my $ref;
my @dx;
foreach $ref (@res) {
my $ref;
my @dx;
foreach $ref (@res) {
- @dx = @$ref;
- push @out, Spot::formatl(@dx);
+ push @out, Spot::formatl(@$ref);
}
return (1, @out);
}
return (1, @out);