add help for sh/dx zone etc

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index f59ef4f4965bca34c5b747d30c0c9b03390bfc5e..6c5c9162ea2547d129b6e84a41525698baab8588 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -17,6 +17,7 @@ use Julian;
 use Prefix;
 use DXDupe;
 use Data::Dumper;
+use QSL;
 
 use strict;
 
@@ -26,7 +27,7 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0))
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots);
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots );
 
 $fp = undef;
 $statp = undef;
@@ -120,39 +121,25 @@ sub prepare
        # normalise frequency
        $_[0] = sprintf "%.1f", $_[0];
   
-       # remove ssids if present on spotter
+       # remove ssids and /xxx if present on spotter
        $out[4] =~ s/-\d+$//o;
 
        # remove leading and trailing spaces
        $_[3] = unpad($_[3]);
        
-       my ($spotted_dxcc, $spotted_itu, $spotted_cq, $spotted_state) = (666, 0, 0, "");
-       my ($spotter_dxcc, $spotter_itu, $spotter_cq, $spotter_state) = (666, 0, 0, "");
        
        # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
-       my @dxcc = Prefix::extract($out[1]);
-       if (@dxcc) {
-               $spotted_dxcc = $dxcc[1]->dxcc();
-               $spotted_itu = $dxcc[1]->itu();
-               $spotted_cq = $dxcc[1]->cq();
-               $spotted_state = $dxcc[1]->state();
-       }
-       push @out, $spotted_dxcc;
-       @dxcc = Prefix::extract($out[4]);
-       if (@dxcc) {
-               $spotter_dxcc = $dxcc[1]->dxcc();
-               $spotter_itu = $dxcc[1]->itu();
-               $spotter_cq = $dxcc[1]->cq();
-               $spotter_state = $dxcc[1]->state();
-       }
-       push @out, $spotter_dxcc;
+       my @spd = Prefix::cty_data($out[1]);
+       push @out, $spd[0];
+       my @spt = Prefix::cty_data($out[4]);
+       push @out, $spt[0];
        push @out, $_[5];
-       return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq, $spotted_state, $spotter_state);
+       return (@out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]);
 }
 
 sub add
 {
-       my $buf = join("\^", @_[0..7]);
+       my $buf = join("\^", @_);
        $fp->writeunix($_[2], $buf);
        $totalspots++;
        if ($_[0] <= 30000) {
@@ -160,6 +147,10 @@ sub add
        } else {
                $vhfspots++;
        }
+       if ($_[3] =~ /(?:QSL|VIA)/i) {
+               my $q = QSL::get($_[1]) || new QSL $_[1];
+               $q->update($_[3], $_[2], $_[4]);
+       }
 }
 
 # search the spot database for records based on the field no and an expression
@@ -189,7 +180,7 @@ sub add
 
 sub search
 {
-       my ($expr, $dayfrom, $dayto, $from, $to, $hint) = @_;
+       my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_;
        my $eval;
        my @out;
        my $ref;
@@ -211,9 +202,21 @@ sub search
        
        $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0;
 
-       $expr =~ s/\$f(\d)/\$ref->[$1]/g; # swap the letter n for the correct field name
+       $expr =~ s/\$f(\d\d?)/\$ref->[$1]/g; # swap the letter n for the correct field name
        #  $expr =~ s/\$f(\d)/\$spots[$1]/g;               # swap the letter n for the correct field name
   
+       my $checkfilter;
+       $checkfilter = qq (
+                      if (\@s < 9) {
+                          my \@a = (Prefix::cty_data(\$s[1]))[1..3];
+                          my \@b = (Prefix::cty_data(\$s[4]))[1..3];
+                          push \@s, \@a[0,1], \@b[0,1], \$a[2], \$a[2];  
+                      }
+                         my (\$filter, \$hops) = \$dxchan->{spotsfilter}->it(\@s);
+                         next unless (\$filter);
+                      ) if $dxchan;
+       $checkfilter ||= ' ';
+       
        dbg("hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search');
   
        # build up eval to execute
@@ -221,7 +224,9 @@ sub search
                           while (<\$fh>) {
                                   $hint;
                                   chomp;
-                                  push \@spots, [ split '\\^' ];
+                                  my \@s = split /\\^/;
+                   $checkfilter;
+                   push \@spots, \\\@s;
                           }
                           my \$c;
                           my \$ref;
@@ -235,6 +240,9 @@ sub search
                                        }
                                }
                          );
+    
+       dbg("Spot eval: $eval") if isdbg('searcheval');
+       
 
        $fp->close;                                     # close any open files