#
# show dx (normal)
#
-# $Id$
+#
#
my ($self, $line) = @_;
next;
}
if (lc $f =~ /^filt/) {
- $dofilter = 1 if $self->spotsfilter;
+ $dofilter = 1 if $self && $self->spotsfilter;
next;
}
if (lc $f eq 'qsl') {
}
}
unless (@ans) {
- $pre .= '*' unless $pre =~ /[\*\?\[]/o;
+ $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
$pre = shellregex($pre);
+ if ($main::dbh) {
+ $pre =~ s/\.\*/%/g;
+ } else {
+ $pre =~ s/\.\*\$$//;
+ }
$expr = "\$f1 =~ m{$pre}";
$pre =~ s/[\^\$]//g;
$hint = "m{\U$pre}";
$expr .= ' && ' if $expr;
$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
$spotter = shellregex($spotter);
+ if ($main::dbh) {
+ $spotter =~ s/\.\*/%/g;
+ } else {
+ $spotter =~ s/\.\*\$$//;
+ }
$expr .= "\$f4 =~ m{\U$spotter}";
$hint .= ' && ' if $hint;
$spotter =~ s/[\^\$]//g;
my $ref;
my @dx;
foreach $ref (@res) {
- if ($self->ve7cc) {
+ if ($self && $self->ve7cc) {
push @out, VE7CC::dx_spot($self, @$ref);
} else {
- if ($real) {
- push @out, $self->format_dx_spot(@$ref);
+ if ($self && $real) {
+ push @out, DXCommandmode::format_dx_spot($self, @$ref);
} else {
push @out, Spot::formatl(@$ref);
}