#
# show dx (normal)
#
-# $Id$
+#
#
my ($self, $line) = @_;
my $itu;
my $byitu;
my $fromdxcc;
+my $exact;
my ($doqsl, $doiota, $doqra, $dofilter);
+my $usesql = $main::dbh && $Spot::use_db_for_search;
+
while ($f = shift @list) { # next field
# print "f: $f list: ", join(',', @list), "\n";
if (!$from && !$to) {
($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
next if $to;
}
+ if (lc $f eq 'exact') {
+ $exact = 1;
+ next;
+ }
if (lc $f eq 'dxcc') {
$dxcc = 1;
next;
}
}
unless (@ans) {
- $pre .= '*' unless $pre =~ /[\*\?\[]/o;
+ $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
$pre = shellregex($pre);
+ if ($usesql) {
+ $pre =~ s/\.\*/%/g;
+ } else {
+ $pre =~ s/\.\*\$$//;
+ }
+ $pre .= '$' if $exact;
$expr = "\$f1 =~ m{$pre}";
$pre =~ s/[\^\$]//g;
$hint = "m{\U$pre}";
$expr .= ' && ' if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
+ if ($usesql) {
+ $spotter =~ s/\.\*/%/g;
+ } else {
+ $spotter =~ s/\.\*\$$//;
+ }
$expr .= "\$f4 =~ m{\U$spotter}";
$hint .= ' && ' if $hint;
$spotter =~ s/[\^\$]//g;
push @expr, "\$f12 eq '$_'";
push @hint, "m{$_}";
}
- if ($main::dbh) {
+ if ($usesql) {
$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
} else {
$expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
push @expr, "\$f13 eq '$_'";
push @hint, "m{$_}";
}
- if ($main::dbh) {
+ if ($usesql) {
$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
} else {
$expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";