make sh/dx on 6m by g works

[spider.git] / cmd / show / dx.pl

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index a70ef50f66f7f2ac848eafd7e468e5e131732f2f..b2257c49b48ac04e412be931cc731f459e84174b 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -18,6 +18,7 @@ my $pre;
 my $spotter;
 my $info;
 my $expr;
+my $hint;
 my ($doqsl, $doiota, $doqra);
 
 while ($f = shift @list) {             # next field
@@ -32,7 +33,7 @@ while ($f = shift @list) {            # next field
        }
        if (lc $f eq 'on' && $list[0]) { # is it freq range?
                #    print "yup freq\n";
-               my @r = split '/', $list[0];
+               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
@@ -65,12 +66,12 @@ while ($f = shift @list) {          # next field
                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[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;
+               $doiota = '\b(IOTA|(AF|AN|NA|SA|EU|AS|OC)[- ]?\d?\d\d)\b' unless $doiota;
                next;
        }
        if (lc $f eq 'qra') {
@@ -87,64 +88,79 @@ while ($f = shift @list) {          # next field
 if ($pre) {
        $pre .= '*' unless $pre =~ /[\*\?\[]/o;
        $pre = shellregex($pre);
-       $expr = "\$f1 =~ m{$pre}o";
-} else {
-       $expr = "1";                            # match anything
+       $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;
        }
-       chop $expr;
-       chop $expr;
+       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}io";
+       $expr .= "\$f3 =~ m{$info}i";
+       $hint .= " && " if $hint;
+       $hint .= "m{$info}i";
 }
 
 # any spotter
 if ($spotter) {
        $expr .= " && " if $expr;
+       $spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
        $spotter = shellregex($spotter);
-       $expr .= "\$f4 =~ m{$spotter}o";
+       $expr .= "\$f4 =~ m{\U$spotter}";
+       $hint .= " && " if $hint;
+       $spotter =~ s/[\^\$]//g;
+       $hint .= "m{\U$spotter}";
 }
 
 # qsl requests
 if ($doqsl) {
        $expr .= " && " if $expr;
-       $expr .= "\$f3 =~ m{(QSL|VIA)}io";
+       $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}io";
+       $expr .= "\$f3 =~ m{$doiota}i";
+       $hint .= " && " if $hint;
+       $hint .= "m{$doiota}i";
 }
 
 # iota requests
 if ($doqra) {
        $expr .= " && " if $expr;
-       $expr .= "\$f3 =~ m{$doqra}io";
+       $expr .= "\$f3 =~ m{$doqra}i";
+       $hint .= " && " if $hint;
+       $hint .= "m{$doqra}io";
 }
 
 #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);
+my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint);
 my $ref;
 my @dx;
 foreach $ref (@res) {
-       @dx = @$ref;
-       push @out, Spot::formatl(@dx);
+       push @out, Spot::formatl(@$ref);
 }
 
 return (1, @out);