my $expr;
my $hint;
my $dxcc;
+my $real;
+my $zone;
+my $byzone;
+my $state;
+my $bystate;
+my $itu;
+my $byitu;
my $fromdxcc;
-my ($doqsl, $doiota, $doqra);
+my ($doqsl, $doiota, $doqra, $dofilter);
while ($f = shift @list) { # next field
# print "f: $f list: ", join(',', @list), "\n";
$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+)?$|) {
}
next;
}
+ if (lc $f =~ /^filt/) {
+ $dofilter = 1;
+ next;
+ }
if (lc $f eq 'qsl') {
$doqsl = 1;
next;
my ($a, $b);
# $DB::single =1;
- if ($list[0] && (($a, $b) = $list[0] =~ /(AF|AN|NA|SA|EU|AS|OC)-?(\d?\d\d)/oi)) {
+ 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;
next;
}
if (lc $f eq 'qra') {
- $doqra = uc shift @list if $list[0] =~ /[A-Z][A-Z]\d\d/oi;
+ $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 (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;
+ next;
+ }
+ if (lc $f =~ /^by_?itu/) {
+ $byitu = shift @list if @list;
+ next;
+ }
+ if (lc $f eq 'state') {
+ $state = uc shift @list if @list;
+ next;
+ }
+ if (lc $f =~ /^by_?state/) {
+ $bystate = uc shift @list if @list;
+ next;
+ }
if (!$pre) {
$pre = uc $f;
}
# now deal with any frequencies specified
if (@freq) {
$expr .= ($expr) ? " && (" : "(";
- $hint .= ($hint) ? " && (" : "(";
+# $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{$r\\.} ||" if $r;
+# $hint .= "m{\d+\.} ||";
+# $hint .= "1 ||";
}
chop $expr; chop $expr;
- chop $hint; chop $hint;
+# chop $hint; chop $hint;
$expr .= ")";
- $hint .= ")";
+# $hint .= ")";
}
# any info
}
}
+# zone requests
+if ($zone) {
+ my @expr;
+ my @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;
+ 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;
+ 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;
+ 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;
+ for (split /[:,]/, $state) {
+ push @expr, "\$f12 eq '$_'";
+ push @hint, "m{$_}";
+ }
+ $expr .= @expr > 1 ? '($f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
+ $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+}
+if ($bystate) {
+ my @expr;
+ my @hint;
+ for (split /[:,]/, $bystate) {
+ push @expr, "\$f13 eq '$_'";
+ push @hint, "m{$_}";
+ }
+ $expr .= @expr > 1 ? '($f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
+ $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+}
+
# qsl requests
if ($doqsl) {
$expr .= " && " if $expr;
#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 @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
my $ref;
my @dx;
foreach $ref (@res) {
- push @out, Spot::formatl(@$ref);
+ if ($real) {
+ push @out, $self->format_dx_spot(@$ref);
+ } else {
+ push @out, Spot::formatl(@$ref);
+ }
}
return (1, @out);