X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=655630ce798b24baee204c2899230095b2db3b90;hb=8106275008346b0cceb090f7317ff4240a3ba44f;hp=71bb2e61d85cffa5935f53f7cb9ff9e8d329d581;hpb=91a3d0439029d8bb76f3439aa9ecc0e699f5a195;p=spider.git diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl index 71bb2e61..655630ce 100644 --- a/cmd/show/dx.pl +++ b/cmd/show/dx.pl @@ -5,434 +5,149 @@ # require 5.10.1; +use warnings; sub handle { my ($self, $line) = @_; - my @list = split /\s+/, $line; # split the line up + # disguise regexes + $line =~ s/\{(.*)\}/'{'. unpack('H*', $1) . '}'/eg; + dbg("sh/dx disguise any regex: '$line'") if isdbg('sh/dx'); + + # now space out brackets and ! + $line =~ s/([\(\!\)])/ $1 /g; + + my @list = split /[\s]+/, $line; # split the line up + + # put back the regexes + @list = map { my $l = $_; $l =~ s/\{([0-9a-fA-F]+)\}/'{' . pack('H*', $1) . '}'/eg; $l } @list; + + dbg("sh/dx after regex return: " . join(' ', @list)) if isdbg('sh/dx'); + my @out; my $f; my $call = $self->call; - my ($from, $to); - my ($fromday, $today); - my @freq; - my @ans; + my $usesql = $main::dbh && $Spot::use_db_for_search; + my ($from, $to) = (0, 0); + my ($fromday, $today) = (0, 0); + my $exact; + my $real; + my $dofilter; my $pre; - my $spotter; - my $info; - my $expr; - my $hint; my $dxcc; - my $real; - my $zone; - my $byzone; - my $state; - my $bystate; - my $itu; - 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; + my @flist; + + dbg("sh/dx \@list: " . join(" ", @list)) if isdbg('sh/dx'); + while ($f = shift @list) { # next field - dbg "arg: $f list: " . join(',', @list) if isdbg('sh/dx'); + dbg "sh/dx arg: $f list: " . join(',', @list) if isdbg('sh/dx'); if (!$from && !$to) { ($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count? + dbg("sh/dx from: $from to: $to") if isdbg('sh/dx'); next if $from && $to > $from; } if (!$to) { ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count? + dbg("sh/dx to: $to") if isdbg('sh/dx'); next if $to; } - if (lc $f eq 'exact') { - $exact = 1; - next; - } - if (lc $f eq 'dxcc') { - $dxcc = 1; - next; - } - if (lc $f eq 'rt' || $f =~ /^real/i) { - $real = 1; - next; - } - if (lc $f eq 'on' && $list[0]) { # is it freq range? - 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]; - 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('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('sh/dx'); + dbg "sh/dx 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('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'); + if (lc $f eq 'exact') { + dbg("sh/dx exact") if isdbg('sh/dx'); + $exact = 1; 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('sh/dx'); + if (lc $f eq 'rt' || $f =~ /^real/i) { + dbg("sh/dx real") if isdbg('sh/dx'); + $real = 1; next; } if (lc $f =~ /^filt/) { + dbg("sh/dx run spotfilter") if isdbg('sh/dx'); $dofilter = 1 if $self && $self->spotsfilter; next; } if (lc $f eq 'qsl') { - $doqsl = 1; + dbg("sh/dx qsl") if isdbg('sh/dx'); + push @flist, "info {QSL|VIA}"; next; } if (lc $f eq 'iota') { - my ($a, $b); - # $DB::single =1; - - if (@list && $list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)-?(\d?\d\d)/oi)) { + my $doiota; + if (@list && $list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)[-\s]?(\d\d?\d?)/i)) { $a = uc $a; $doiota = "\\b$a\[\-\ \]\?$b\\b"; shift @list; } - $doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[- ]?\d?\d\d)\b' unless $doiota; + $doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[-\s]?\d?\d\d)\b' unless $doiota; + push @flist, 'info', "{$doiota}"; + dbg("sh/dx iota info {$doiota}") if isdbg('sh/dx'); next; } if (lc $f eq 'qra') { - $doqra = uc shift @list if @list && $list[0] =~ /[A-Z][A-Z]\d\d/oi; + my $doqra = uc shift @list if @list && $list[0] =~ /[A-Z][A-Z]\d\d/i; $doqra = '\b([A-Z][A-Z]\d\d|[A-Z][A-Z]\d\d[A-Z][A-Z])\b' unless $doqra; + push @flist, 'info', "{$doqra}"; + dbg("sh/dx qra info {$doqra}") if isdbg('sh/dx'); next; } - if (lc $f eq 'zone') { - $zone = shift @list if @list; - next; - } - if (lc $f =~ /^by_?zone/) { - $byzone = shift @list if @list; - next; - } - if (lc $f eq 'itu') { - $itu = shift @list if @list; + if (grep {lc $f eq $_} qw { ( or and not ) }) { + push @flist, $f; + dbg("sh/dx operator $f") if isdbg('sh/dx'); next; } - if (lc $f =~ /^by_?itu/) { - $byitu = shift @list if @list; + if (grep {lc $f eq $_} qw(on freq call info spotter by call_dxcc by_dxcc bydxcc origin call_itu itu call_zone zone byitu by_itu by_zone byzone call_state state bystate by_state ip) ) { + push @flist, $f; + push @flist, shift @list if @list; + dbg("sh/dx function $flist[-2] $flist[-1]") if isdbg('sh/dx'); next; } - if (lc $f eq 'state') { - $state = uc shift @list if @list; + unless ($pre) { + $pre = $f; next; } - if (lc $f =~ /^by_?state/) { - $bystate = uc shift @list if @list; - next; - } - if (!$pre) { - $pre = uc $f; - } - } - - #$DB::single = 1; - - # check origin - if ($origin) { - $expr .= ' && ' if $expr; - $expr .= "\$f7 eq '$origin'"; - $hint .= ' && ' if $hint; - $hint .= "m{$origin}"; + push @flist, $f; } - # 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; - if ($dxcc) { - @ans = Prefix::extract($pre); # is it a callsign/prefix? - - if (@ans) { - - # first deal with the prefix - my $pre = shift @ans; - my $a; - my $str = "Prefix: $pre"; - my $l = length $str; - my @expr; - my @hint; - - # build up a search string for this dxcc country/countries - foreach $a (@ans) { - my $n = $a->dxcc(); - push @expr, "\$f5 == $n"; - push @hint, "m{$n}"; - my $name = $a->name(); - $str .= " Dxcc: $n ($name)"; - push @out, $str; - $str = ' ' x $l; - } - $expr = @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0]; - $hint = @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; - } - } - unless (@ans) { + if ($pre) { + # someone (probably me) has forgotten the 'info' keyword + if ($pre =~ /^{.*}$/) { + push @flist, 'info', $pre; + } else { $pre .= '*' unless $pre =~ /[\*\?\[]$/o; $pre = shellregex($pre); if ($usesql) { $pre =~ s/\.\*/%/g; - } - else { + } else { $pre =~ s/\.\*\$$//; } $pre .= '$' if $exact; - $expr = "\$f1 =~ m{$pre}"; - $pre =~ s/[\^\$]//g; - $hint = "m{\U$pre}"; - } - } - - # now deal with any frequencies specified - if (@freq) { - $expr .= ($expr) ? ' && (' : "("; - # $hint .= ($hint) ? ' && ' : "("; - # $hint .= ' && ' if $hint; - 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; - # $hint .= "m{\d+\.} ||"; - # $hint .= "1 ||"; + $pre =~ s/\^//; + push @flist, 'call', $pre; } - chop $expr; chop $expr; - # chop $hint; chop $hint; - $expr .= ")"; - # $hint .= ")"; } - - # any info - if ($info) { - $expr .= ' && ' if $expr; - # $info =~ s{(.)}{"\Q$1"}ge; - $expr .= "\$f3 =~ m{$info}i"; - $hint .= ' && ' if $hint; - $hint .= "m{$info}i"; - } - - # any spotter - if ($spotter) { - if ($fromdxcc) { - @ans = Prefix::extract($spotter); # is it a callsign/prefix? - - if (@ans) { - - # first deal with the prefix - my $pre = shift @ans; - my $a; - $expr .= ' && ' if $expr; - $hint .= ' && ' if $hint; - my $str = "Spotter: $pre"; - my $l = length $str; - my @expr; - my @hint; - - # build up a search string for this dxcc country/countries - foreach $a (@ans) { - my $n = $a->dxcc(); - push @expr, "\$f6 == $n"; - push @hint, "m{$n}"; - my $name = $a->name(); - $str .= " Dxcc: $n ($name)"; - push @out, $str; - $str = ' ' x $l; - } - $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0]; - $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; - } - } - unless (@ans) { - $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; - $hint .= "m{\U$spotter}"; - } - } - - # zone requests - if ($zone) { - my @expr; - my @hint; - $expr .= ' && ' if $expr; - $hint .= ' && ' if $hint; - for (split /[:,]/, $zone) { - push @expr, "\$f9==$_"; - push @hint, "m{$_}"; - } - $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0]; - $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; - } - if ($byzone) { - my @expr; - my @hint; - $expr .= ' && ' if $expr; - $hint .= ' && ' if $hint; - for (split /[:,]/, $byzone) { - push @expr, "\$f11==$_"; - push @hint, "m{$_}"; - } - $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0]; - $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; - } - - # itu requests - if ($itu) { - my @expr; - my @hint; - $expr .= ' && ' if $expr; - $hint .= ' && ' if $hint; - for (split /[:,]/, $itu) { - push @expr, "\$f8==$_"; - push @hint, "m{$_}"; - } - $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0]; - $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; - } - if ($byitu) { - my @expr; - my @hint; - $expr .= ' && ' if $expr; - $hint .= ' && ' if $hint; - for (split /[:,]/, $byitu) { - push @expr, "\$f10==$_"; - push @hint, "m{$_}"; - } - $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0]; - $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; - } - - # state requests - if ($state) { - my @expr; - my @hint; - $expr .= ' && ' if $expr; - $hint .= ' && ' if $hint; - for (split /[:,]/, $state) { - push @expr, "\$f12 eq '$_'"; - push @hint, "m{$_}"; - } - if ($usesql) { - $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]"; - } - else { - $expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])"; - } - $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; - } - if ($bystate) { - my @expr; - my @hint; - $expr .= ' && ' if $expr; - $hint .= ' && ' if $hint; - for (split /[:,]/, $bystate) { - push @expr, "\$f13 eq '$_'"; - push @hint, "m{$_}"; - } - if ($usesql) { - $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]"; - } - else { - $expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])"; - } - $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0]; - } - - # qsl requests - if ($doqsl) { - $expr .= ' && ' if $expr; - $expr .= "\$f3 =~ m{QSL|VIA}i"; - $hint .= ' && ' if $hint; - $hint .= "m{QSL|VIA}i"; - } - - # iota requests - if ($doiota) { - $expr .= ' && ' if $expr; - $expr .= "\$f3 =~ m{$doiota}i"; - $hint .= ' && ' if $hint; - $hint .= "m{$doiota}i"; - } - - # iota requests - if ($doqra) { - $expr .= ' && ' if $expr; - $expr .= "\$f3 =~ m{$doqra}i"; - $hint .= ' && ' if $hint; - $hint .= "m{$doqra}io"; - } - + my $newline = join(' ', @flist); + dbg("sh/dx newline: $newline") if isdbg('sh/dx'); + my ($r, $filter, $fno, $user, $expr) = $Spot::filterdef->parse($self, 'spots', $newline, 1); - $from ||= ''; - $to ||= ''; - $fromday ||= ''; - $today ||= ''; + return (0, "sh/dx parse error '$r' " . $filter) if $r; - dbg "expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx'); + $user ||= ''; + dbg "sh/dx user: $user expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx'); # now do the search if ($self->{_nospawn}) { - my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef); + my @res = Spot::search($expr, $fromday, $today, $from, $to, $user, $dofilter ? $self : undef); my $ref; my @dx; foreach $ref (@res) { @@ -451,7 +166,7 @@ sub handle } else { push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search, - args => [$expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef], + args => [$expr, $fromday, $today, $from, $to, $filter, $dofilter ? $self : undef], cb => sub { my ($dxchan, @res) = @_; my $ref;