-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;
-
-while ($f = shift @list) { # next field
- print "f: $f list: ", join(',', @list), "\n";
- if (!$from && !$to) {
- ($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # 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 'on' && $list[0]) { # is it freq range?
- print "yup freq\n";
- my @r = split '/', $list[0];
- print "r0: $r[0] r1: $r[1]\n";
- @freq = Bands::get_freq($r[0], $r[1]);
- if (@freq) { # yup, get rid of extranous param
- print "freq: ", join(',', @freq), "\n";
- shift @list;
- next;
+ 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 (!$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 'day' && $list[0]) {
+ ($fromday, $today) = split m|[-/]|, shift(@list);
+ dbg "sh/dx got day $fromday/$today" if isdbg('sh/dx');
+ next;
+ }
+ 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 '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;
+ }
+ $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 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;