remove $Id$ strings from everywhere that I can find

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

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index bfeabf4c7216479b7052f3e28c068e58ff1f40df..f99a2b6cf8c1a08c81bb6e5aee15e1da5e05ad61 100644 (file)
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -1,7 +1,7 @@
 #
 # show dx (normal)
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -21,6 +21,12 @@ 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, $dofilter);
 
@@ -80,7 +86,7 @@ while ($f = shift @list) {            # next field
                next;
        }
        if (lc $f =~ /^filt/) {
-               $dofilter = 1;
+               $dofilter = 1 if $self && $self->spotsfilter;
                next;
        }
        if (lc $f eq 'qsl') {
@@ -104,11 +110,37 @@ while ($f = shift @list) {                # next field
                $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;
        }
 }
 
+#$DB::single = 1;
+
 # first deal with the prefix
 if ($pre) {
        my @ans;
@@ -141,8 +173,13 @@ if ($pre) {
                }
        } 
        unless (@ans) {
-               $pre .= '*' unless $pre =~ /[\*\?\[]/o;
+               $pre .= '*' unless $pre =~ /[\*\?\[]$/o;
                $pre = shellregex($pre);
+               if ($main::dbh) {
+                       $pre =~ s/\.\*/%/g;
+               } else {
+                       $pre =~ s/\.\*\$$//;
+               }
                $expr = "\$f1 =~ m{$pre}";
                $pre =~ s/[\^\$]//g;
                $hint = "m{\U$pre}";
@@ -151,28 +188,29 @@ if ($pre) {
   
 # now deal with any frequencies specified
 if (@freq) {
-       $expr .= ($expr) ? " && (" : "(";
-       $hint .= ($hint) ? " && (" : "(";
+       $expr .= ($expr) ? ' && (' : "(";
+#      $hint .= ($hint) ? ' && ' : "(";
+#      $hint .= ' && ' if $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{\d+\.} ||";
-               $hint .= "1 ||";
+#              $hint .= "1 ||";
        }
        chop $expr;     chop $expr;
-       chop $hint;     chop $hint;
+#      chop $hint;     chop $hint;
        $expr .= ")";
-       $hint .= ")";
+#      $hint .= ")";
 }
 
 # any info
 if ($info) {
-       $expr .= " && " if $expr;
+       $expr .= ' && ' if $expr;
        $info =~ s{(.)}{"\Q$1"}ge;
        $expr .= "\$f3 =~ m{$info}i";
-       $hint .= " && " if $hint;
+       $hint .= ' && ' if $hint;
        $hint .= "m{$info}i";
 }
 
@@ -209,37 +247,128 @@ if ($spotter) {
                }
        } 
        unless (@ans) {
-               $expr .= " && " if $expr;
+               $expr .= ' && ' if $expr;
                $spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
                $spotter = shellregex($spotter);
+               if ($main::dbh) {
+                       $spotter =~ s/\.\*/%/g;
+               } else {
+                       $spotter =~ s/\.\*\$$//;
+               }
                $expr .= "\$f4 =~ m{\U$spotter}";
-               $hint .= " && " if $hint;
+               $hint .= ' && ' if $hint;
                $spotter =~ s/[\^\$]//g;
                $hint .= "m{\U$spotter}";
        }
 }
 
+# zone requests
+if ($zone) {
+       my @expr;
+       my @hint;
+       $expr .= ' && ' if $expr;
+       $hint .= ' && ' if $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;
+       $expr .= ' && ' if $expr;
+       $hint .= ' && ' if $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;
+       $expr .= ' && ' if $expr;
+       $hint .= ' && ' if $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;
+       $expr .= ' && ' if $expr;
+       $hint .= ' && ' if $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;
+       $expr .= ' && ' if $expr;
+       $hint .= ' && ' if $hint;
+       for (split /[:,]/, $state) {
+               push @expr, "\$f12 eq '$_'";
+               push @hint, "m{$_}";
+       }
+       if ($main::dbh) {
+               $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
+       } else {
+               $expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
+       }
+       $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+}
+if ($bystate) {
+       my @expr;
+       my @hint;
+       $expr .= ' && ' if $expr;
+       $hint .= ' && ' if $hint;
+       for (split /[:,]/, $bystate) {
+               push @expr, "\$f13 eq '$_'";
+               push @hint, "m{$_}";
+       }
+       if ($main::dbh) {
+               $expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
+       } else {
+               $expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
+       }
+       $hint .= @hint > 1 ? '(' . join(' || ', @hint) . ')' : $hint[0];
+}
+
 # qsl requests
 if ($doqsl) {
-       $expr .= " && " if $expr;
+       $expr .= ' && ' if $expr;
        $expr .= "\$f3 =~ m{QSL|VIA}i";
-       $hint .= " && " if $hint;
+       $hint .= ' && ' if $hint;
        $hint .= "m{QSL|VIA}i";
 }
 
 # iota requests
 if ($doiota) {
-       $expr .= " && " if $expr;
+       $expr .= ' && ' if $expr;
        $expr .= "\$f3 =~ m{$doiota}i";
-       $hint .= " && " if $hint;
+       $hint .= ' && ' if $hint;
        $hint .= "m{$doiota}i";
 }
 
 # iota requests
 if ($doqra) {
-       $expr .= " && " if $expr;
+       $expr .= ' && ' if $expr;
        $expr .= "\$f3 =~ m{$doqra}i";
-       $hint .= " && " if $hint;
+       $hint .= ' && ' if $hint;
        $hint .= "m{$doqra}io";
 }
 
@@ -250,10 +379,14 @@ my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $
 my $ref;
 my @dx;
 foreach $ref (@res) {
-       if ($real) {
-               push @out, $self->format_dx_spot(@$ref);
+       if ($self && $self->ve7cc) {
+               push @out, VE7CC::dx_spot($self, @$ref);
        } else {
-               push @out, Spot::formatl(@$ref);
+               if ($self && $real) {
+                       push @out, DXCommandmode::format_dx_spot($self, @$ref);
+               } else {
+                       push @out, Spot::formatl(@$ref);
+               }
        }
 }