my $byitu;
my $fromdxcc = 0;
my $exact;
+my $origin;
+my $ip;
my ($doqsl, $doiota, $doqra, $dofilter);
my $usesql = $main::dbh && $Spot::use_db_for_search;
while ($f = shift @list) { # next field
- dbg "arg: $f list: " . join(',', @list) if isdbg('shdx');
+ dbg "arg: $f list: " . join(',', @list) if isdbg('sh/dx');
if (!$from && !$to) {
($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
next if $from && $to > $from;
next;
}
if (lc $f eq 'on' && $list[0]) { # is it freq range?
- dbg "freq $list[0]" if isdbg('shdx');
+ dbg "freq $list[0]" if isdbg('sh/dx');
if (my ($from, $to) = $list[0] =~ m|^(\d+)(?:\.\d+)?(?:[-/](\d+)(?:\.\d+)?)?$|) {
$to = $from unless defined $to;
- dbg "freq '$from' '$to'" if isdbg('shdx');
+ dbg "freq '$from' '$to'" if isdbg('sh/dx');
push @freq, $from, $to;
shift @list;
next;
} else {
my @r = split '/', lc $list[0];
- dbg "r0: $r[0] r1: $r[1]" if isdbg('shdx');
+ dbg "r0: $r[0] r1: $r[1]" if isdbg('sh/dx');
my @fr = Bands::get_freq($r[0], $r[1]);
if (@fr) { # yup, get rid of extranous param
- dbg "freq: " . join(',', @fr) if isdbg('shdx');
+ dbg "freq: " . join(',', @fr) if isdbg('sh/dx');
push @freq, @fr; # add these to the list
shift @list;
next;
}
if (lc $f eq 'day' && $list[0]) {
($fromday, $today) = split m|[-/]|, shift(@list);
- dbg "got day $fromday/$today" if isdbg('shdx');
+ dbg "got day $fromday/$today" if isdbg('sh/dx');
next;
}
if (lc $f eq 'info' && $list[0]) {
$info = shift @list;
- dbg "got info $info" if isdbg('shdx');
+ dbg "got info $info" if isdbg('sh/dx');
next;
}
+ if (lc $f eq 'origin' && $list[0]) {
+ $origin = uc shift @list;
+ dbg "got origin $origin" if isdbg('sh/dx');
+ next;
+ }
+ if (lc $f eq 'ip' && $list[0]) {
+ $ip = shift @list;
+ dbg "got ip $ip" if isdbg('sh/dx');
+ next;
+ }
+
if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
$spotter = uc shift @list;
if ($list[0] && lc $list[0] eq 'dxcc') {
$fromdxcc = 1;
shift @list;
}
- dbg "got spotter $spotter fromdxcc $fromdxcc" if isdbg('shdx');
+ dbg "got spotter $spotter fromdxcc $fromdxcc" if isdbg('sh/dx');
next;
}
if (lc $f =~ /^filt/) {
#$DB::single = 1;
-# first deal with the prefix
+# check origin
+if ($origin) {
+ $expr .= ' && ' if $expr;
+ $expr .= "\$f7 eq '$origin'";
+ $hint .= ' && ' if $hint;
+ $hint .= "m{$origin}";
+}
+
+# check (any) ip address
+if ($ip) {
+ $expr .= ' && ' if $expr;
+ $expr .= "\$f14 && \$f14 =~ m{^$ip}";
+ $hint .= ' && ' if $hint;
+ $ip =~ s/\./\\./g; # IPV4
+ $hint .= "m{$ip}";
+}
+
+# deal with the prefix
if ($pre) {
my @ans;
# any info
if ($info) {
$expr .= ' && ' if $expr;
- $info =~ s{(.)}{"\Q$1"}ge;
+# $info =~ s{(.)}{"\Q$1"}ge;
$expr .= "\$f3 =~ m{$info}i";
$hint .= ' && ' if $hint;
$hint .= "m{$info}i";
$hint .= "m{$doqra}io";
}
-dbg "expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('shdx');
+
+$from ||= '';
+$to ||= '';
+$fromday ||= '';
+$today ||= '';
+
+dbg "expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx');
# now do the search
-push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search,
+if ($self->{_nospawn}) {
+ my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
+ my $ref;
+ my @dx;
+ foreach $ref (@res) {
+ if ($self && $self->ve7cc) {
+ push @out, VE7CC::dx_spot($self, @$ref);
+ } else {
+ if ($self && $real) {
+ push @out, DXCommandmode::format_dx_spot($self, @$ref);
+ } else {
+ push @out, Spot::formatl(@$ref);
+ }
+ }
+ }
+} else {
+ push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search,
args => [$expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef],
cb => sub {
my ($dxchan, @res) = @_;
}
}
push @out, $self->msg('e3', "sh/dx", "'$line'") unless @out;
- $dxchan->send(@out);
+ return @out;
});
+}
-#my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
-#my $ref;
-#my @dx;
-#foreach $ref (@res) {
-# if ($self && $self->ve7cc) {
-# push @out, VE7CC::dx_spot($self, @$ref);
-# } else {
-# if ($self && $real) {
-# push @out, DXCommandmode::format_dx_spot($self, @$ref);
-# } else {
-# push @out, Spot::formatl(@$ref);
-# }
-# }
-#}
return (1, @out);