fix show/dxcc
[spider.git] / cmd / show / dx.pl
index c3806f8795f801f73551384fc69c44c457ffc172..5ebc103315b631327728378a4e217965b219ef21 100644 (file)
 #
 # show dx (normal)
 #
-# $Id$
+#
 #
 
-my ($self, $line) = @_;
-my @list = split /\s+/, $line; # split the line up
-
-my @out;
-my $f;
-my $call;
-my ($from, $to);
-my ($fromday, $today);
-my @freq;
-my @ans;
-my $pre;
-my $spotter;
-my $info;
-my $expr;
-my $hint;
-my $dxcc;
-my $real;
-my $fromdxcc;
-my ($doqsl, $doiota, $doqra);
-
-while ($f = shift @list) {             # next field
-       #  print "f: $f list: ", join(',', @list), "\n";
-       if (!$from && !$to) {
-               ($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
-               next if $from && $to > $from;
-       }
-       if (!$to) {
-               ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
-               next if $to;
-       }
-       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?
-               #    print "yup freq\n";
-               if ($list[0] =~ m|^(\d+)(?:\.\d+)?[-/](\d+)(?:\.\d+)?$|) {
-                       push @freq, $1, $2;
-                       shift @list;
+require 5.10.1;
+use warnings;
+
+sub handle
+{
+       my ($self, $line) = @_;
+
+       # 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 $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 $dxcc;
+
+       my @flist;
+
+       
+       dbg("sh/dx \@list: " . join(" ", @list)) if isdbg('sh/dx');
+       
+       while ($f = shift @list) {      # next field
+               dbg "sh/dx arg: $f list: " . join(',', @list) if isdbg('sh/dx');
+               if ($f && !$from && !$to) {
+                       ($from, $to) = $f =~ m|^(\d+)[-/](\d+)$| || (0,0); # is it a from -> to count?
+                       dbg("sh/dx from: $from to: $to") if isdbg('sh/dx');
+                       next if $from && $to > $from;
+               }
+               if ($f && !$to) {
+                       ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
+                       $to ||= 0;
+                       dbg("sh/dx to: $to") if isdbg('sh/dx');
+                       next if $to;
+               }
+               if (lc $f eq 'day' && $list[0]) {
+                       ($fromday, $today) = split m|[-/]|, shift(@list);
+                       dbg "sh/dx got day $fromday/$today" if isdbg('sh/dx');
                        next;
-               } else {
-                       my @r = split '/', lc $list[0];
-                       # print "r0: $r[0] r1: $r[1]\n";
-                       my @fr = Bands::get_freq($r[0], $r[1]);
-                       if (@fr) {                      # yup, get rid of extranous param
-                               #         print "freq: ", join(',', @fr), "\n";
-                               push @freq, @fr;    # add these to the list
+               }
+               if (lc $f eq 'exact') {
+                       dbg("sh/dx exact") if isdbg('sh/dx');
+                       $exact = 1;
+                       next;
+               }
+               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') {
+                       dbg("sh/dx qsl") if isdbg('sh/dx');
+                       push @flist, "info {QSL|VIA}";
+                       next;
+               }
+               if (lc $f eq '<es>') {
+                       dbg("sh/dx <es>") if isdbg('sh/dx');
+                       push @flist, "info {<ES>}";
+                       next;
+               }
+               if (lc $f eq '<tr>') {
+                       dbg("sh/dx <es>") if isdbg('sh/dx');
+                       push @flist, "info {<TR>}";
+                       next;
+               }
+               if (lc $f eq '<ms>') {
+                       dbg("sh/dx <ms>") if isdbg('sh/dx');
+                       push @flist, "info {<ms>}";
+                       next;
+               }
+
+               if (lc $f eq 'iota') {
+                       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;
-                               next;
                        }
+                       $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') {
+                       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 (grep {lc $f eq $_} qw { ( or and not ) }) {
+                       push @flist, $f;
+                       dbg("sh/dx operator $f") if isdbg('sh/dx');
+                       next;
+               }
+               if (grep {lc $f eq $_} qw(on freq call info spotter by dxcc 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;
+               }
+               unless ($pre) {
+                       $pre = $f;
+                       next;
+               }
+               push @flist, $f;
        }
-       if (lc $f eq 'day' && $list[0]) {
-               #   print "got day\n";
-               ($fromday, $today) = split m|[-/]|, shift(@list);
-               next;
-       }
-       if (lc $f eq 'info' && $list[0]) {
-               #   print "got info\n";
-               $info = shift @list;
-               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;
-               }
-               next;
-       }
-       if (lc $f eq 'qsl') {
-               $doqsl = 1;
-               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)) {
-                       $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;
-               next;
-       }
-       if (lc $f eq 'qra') {
-               $doqra = uc shift @list if @list && $list[0] =~ /[A-Z][A-Z]\d\d/oi;
-               $doqra = '\b([A-Z][A-Z]\d\d|[A-Z][A-Z]\d\d[A-Z][A-Z])\b' unless $doqra;
-               next;
-       }
-       if (!$pre) {
-               $pre = uc $f;
-       }
-}
 
-# first 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;
+       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 {
+                               $pre =~ s/\.\*\$$//;
                        }
-                       $expr = @expr > 1 ? '(' . join(' || ', @expr) . ')' : $expr[0];
-                       $hint = @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
-               }
-       } 
-       unless (@ans) {
-               $pre .= '*' unless $pre =~ /[\*\?\[]/o;
-               $pre = shellregex($pre);
-               $expr = "\$f1 =~ m{$pre}";
-               $pre =~ s/[\^\$]//g;
-               $hint = "m{\U$pre}";
-       }
-}
-  
-# now deal with any frequencies specified
-if (@freq) {
-       $expr .= ($expr) ? " && (" : "(";
-       $hint .= ($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+\.} ||";
+                       $pre .= '$' if $exact;
+                       $pre =~ s/\^//;
+                       push @flist, 'call', $pre;
+               }
        }
-       chop $expr;     chop $expr;
-       chop $hint;     chop $hint;
-       $expr .= ")";
-       $hint .= ")";
-}
+       
+    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);
 
-# any info
-if ($info) {
-       $expr .= " && " if $expr;
-       $info =~ s{(.)}{"\Q$1"}ge;
-       $expr .= "\$f3 =~ m{$info}i";
-       $hint .= " && " if $hint;
-       $hint .= "m{$info}i";
-}
+       return (0, "sh/dx parse error '$r' " . $filter) if $r;
 
-# 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;
+       $user ||= '';
+       $expr ||= '';
+       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, $user, $dofilter ? $self : undef);
+               my $ref;
+               my @dx;
+               foreach $ref (@res) {
+                       if ($self && $self->ve7cc) {
+                               push @out, VE7CC::dx_spot($self, @$ref);
                        }
-                       $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);
-               $expr .= "\$f4 =~ m{\U$spotter}";
-               $hint .= " && " if $hint;
-               $spotter =~ s/[\^\$]//g;
-               $hint .= "m{\U$spotter}";
+                       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, $filter, $dofilter ? $self : undef],
+                                                                       cb => sub {
+                                                                               my ($dxchan, @res) = @_; 
+                                                                               my $ref;
+                                                                               my @out;
 
-# qsl requests
-if ($doqsl) {
-       $expr .= " && " if $expr;
-       $expr .= "\$f3 =~ m{QSL|VIA}i";
-       $hint .= " && " if $hint;
-       $hint .= "m{QSL|VIA}i";
-}
+                                                                               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;
+                                                                       });
+       }
 
-# 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";
+       return (1, @out);
 }
 
-#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
-  
-# now do the search
-my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint);
-my $ref;
-my @dx;
-foreach $ref (@res) {
-       if ($real) {
-               push @out, $self->format_dx_spot(@$ref);
-       } else {
-               push @out, Spot::formatl(@$ref);
-       }
-}
 
-return (1, @out);