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 c98699969ad095cc4518eab077ee5bf936009821..b2257c49b48ac04e412be931cc731f459e84174b 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -18,6 +18,8 @@ my $pre;
 my $spotter;
 my $info;
 my $expr;
+my $hint;
+my ($doqsl, $doiota, $doqra);
 
 while ($f = shift @list) {             # next field
        #  print "f: $f list: ", join(',', @list), "\n";
@@ -31,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
@@ -56,6 +58,27 @@ while ($f = shift @list) {           # next field
                $spotter = uc shift @list;
                next;
        }
+       if (lc $f eq 'qsl') {
+               $doqsl = 1;
+               next;
+       }
+       if (lc $f eq 'iota') {
+               my ($a, $b);
+#              $DB::single =1;
+               
+               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;
+               next;
+       }
+       if (lc $f eq 'qra') {
+               $doqra = uc shift @list if $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;
        }
@@ -63,53 +86,81 @@ while ($f = shift @list) {          # next field
 
 # first deal with the prefix
 if ($pre) {
-       $expr = "\$f1 =~ /";
-       $pre =~ s|/|\\/|;                       # change the slashes to \/ 
-       if ($pre =~ /^\*/o) {
-               $pre =~ s/^\*//;;
-               $expr .= "$pre\$/o";
-       } else {
-               $expr .= "^$pre/o";
-       }
-} else {
-       $expr = "1";                            # match anything
+       $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;
        }
-       chop $expr;
-       chop $expr;
+       chop $expr;     chop $expr;
+       chop $hint;     chop $hint;
        $expr .= ")";
+       $hint .= ")";
 }
 
 # any info
 if ($info) {
        $expr .= " && " if $expr;
-       $info =~ s|/|\\/|;
-       $expr .= "\$f3 =~ /$info/io";
+       $info =~ s{(.)}{"\Q$1"}ge;
+       $expr .= "\$f3 =~ m{$info}i";
+       $hint .= " && " if $hint;
+       $hint .= "m{$info}i";
 }
 
 # any spotter
 if ($spotter) {
        $expr .= " && " if $expr;
-       $spotter =~ s|/|\\/|;
-       $expr .= "\$f4 =~ /$spotter/o";
+       $spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
+       $spotter = shellregex($spotter);
+       $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}i";
+       $hint .= " && " if $hint;
+       $hint .= "m{QSL|VIA}i";
+}
+
+# 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";
 }
 
 #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);