X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=1e14399fa794434beca2992f3d07e87fb43f6bc2;hb=f2c90f82509ae2be33216ebaed3bc9f8ea3f5f80;hp=f99a2b6cf8c1a08c81bb6e5aee15e1da5e05ad61;hpb=c3505bcfc922cd712bad2c20b3479cf8d1dc54fe;p=spider.git diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl index f99a2b6c..1e14399f 100644 --- a/cmd/show/dx.pl +++ b/cmd/show/dx.pl @@ -4,12 +4,14 @@ # # +require 5.10.1; + my ($self, $line) = @_; my @list = split /\s+/, $line; # split the line up my @out; my $f; -my $call; +my $call = $self->call; my ($from, $to); my ($fromday, $today); my @freq; @@ -27,11 +29,16 @@ my $state; my $bystate; my $itu; my $byitu; -my $fromdxcc; +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 - # print "f: $f list: ", join(',', @list), "\n"; + 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; @@ -40,6 +47,10 @@ while ($f = shift @list) { # next field ($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; @@ -49,17 +60,19 @@ while ($f = shift @list) { # next field next; } if (lc $f eq 'on' && $list[0]) { # is it freq range? - # print "yup freq\n"; - if ($list[0] =~ m|^(\d+)(?:\.\d+)?[-/](\d+)(?:\.\d+)?$|) { - push @freq, $1, $2; + 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('sh/dx'); + push @freq, $from, $to; shift @list; next; } else { my @r = split '/', lc $list[0]; - # print "r0: $r[0] r1: $r[1]\n"; + 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 - # print "freq: ", join(',', @fr), "\n"; + dbg "freq: " . join(',', @fr) if isdbg('sh/dx'); push @freq, @fr; # add these to the list shift @list; next; @@ -67,22 +80,33 @@ while ($f = shift @list) { # next field } } if (lc $f eq 'day' && $list[0]) { - # print "got day\n"; ($fromday, $today) = split m|[-/]|, shift(@list); + dbg "got day $fromday/$today" if isdbg('sh/dx'); next; } if (lc $f eq 'info' && $list[0]) { - # print "got info\n"; $info = shift @list; + 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]) { - # print "got spotter\n"; $spotter = uc shift @list; if ($list[0] && lc $list[0] eq 'dxcc') { $fromdxcc = 1; shift @list; } + dbg "got spotter $spotter fromdxcc $fromdxcc" if isdbg('sh/dx'); next; } if (lc $f =~ /^filt/) { @@ -141,7 +165,24 @@ while ($f = shift @list) { # next field #$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; @@ -175,11 +216,12 @@ if ($pre) { unless (@ans) { $pre .= '*' unless $pre =~ /[\*\?\[]$/o; $pre = shellregex($pre); - if ($main::dbh) { + if ($usesql) { $pre =~ s/\.\*/%/g; } else { $pre =~ s/\.\*\$$//; } + $pre .= '$' if $exact; $expr = "\$f1 =~ m{$pre}"; $pre =~ s/[\^\$]//g; $hint = "m{\U$pre}"; @@ -208,7 +250,7 @@ if (@freq) { # 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"; @@ -250,7 +292,7 @@ if ($spotter) { $expr .= ' && ' if $expr; $spotter .= '*' unless $spotter =~ /[\*\?\[]/o; $spotter = shellregex($spotter); - if ($main::dbh) { + if ($usesql) { $spotter =~ s/\.\*/%/g; } else { $spotter =~ s/\.\*\$$//; @@ -324,7 +366,7 @@ if ($state) { 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])"; @@ -340,7 +382,7 @@ if ($bystate) { 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])"; @@ -372,22 +414,54 @@ if ($doqra) { $hint .= "m{$doqra}io"; } -#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n"; + +$from ||= ''; +$to ||= ''; +$fromday ||= ''; +$today ||= ''; + +dbg "expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx'); # now do the search -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); + +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 { - push @out, Spot::formatl(@$ref); + 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) = @_; + my $ref; + my @out; + + foreach $ref (@res) { + if ($self->ve7cc) { + push @out, VE7CC::dx_spot($self, @$ref); + } else { + if ($real) { + push @out, DXCommandmode::format_dx_spot($self, @$ref); + } else { + push @out, Spot::formatl(@$ref); + } + } + } + push @out, $self->msg('e3', "sh/dx", "'$line'") unless @out; + return @out; + }); } + return (1, @out);