-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 ($doqsl, $doiota, $doqra);
-
-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 '/', 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";
- shift @list;
- push @freq, @fr; # add these to the list
- next;
- }
- }
- if (lc $f eq 'day' && $list[0]) {
- # print "got day\n";
- ($fromday, $today) = split '-', 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;
- next;
- }
- if (lc $f eq 'qsl') {
- $doqsl = 1;
- next;
- }
- if (lc $f eq 'iota') {
- my ($a, $b);
-# $DB::single =1;
+ my $usesql = $main::dbh && $Spot::use_db_for_search;
+
+ while ($f = shift @list) { # next field
+ 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;
+ }
+ if (!$to) {
+ ($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;
+ }
+ 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');
+ 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');
+ 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');
+ next;
+ }
+ if (lc $f =~ /^filt/) {
+ $dofilter = 1 if $self && $self->spotsfilter;
+ next;
+ }
+ if (lc $f eq 'qsl') {
+ $doqsl = 1;
+ next;
+ }
+ if (lc $f eq 'iota') {
+ my ($a, $b);
+ # $DB::single =1;