remove all old dx stuff and check that it all now works solely from the

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index dc63dbff42c1c2ab1309d843107e10ce6bbff4ae..66652795f49e82a777959ad49ae66a66d0c436a2 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;
 
@@ -101,9 +102,6 @@ sub init
        mkdir "$dirprefix", 0777 if !-e "$dirprefix";
        $fp = DXLog::new($dirprefix, "dat", 'd');
        $statp = DXLog::new($dirprefix, "dys", 'd');
-       my $rm = $main::is_win ? 'del' : 'rm -f';
-       system("$rm $main::data/$dirprefix/*/*.bys");
-       system("$rm $main::data/$dirprefix/*/*.cys");
 }
 
 sub prefix
@@ -120,39 +118,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]);
+       unpad($out[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 +144,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 +177,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 +199,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 +221,9 @@ sub search
                           while (<\$fh>) {
                                   $hint;
                                   chomp;
-                                  push \@spots, [ split '\\^' ];
+                                  my \@s = split /\\^/;
+                   $checkfilter;
+                   push \@spots, \\\@s;
                           }
                           my \$c;
                           my \$ref;
@@ -235,6 +237,9 @@ sub search
                                        }
                                }
                          );
+    
+       dbg("Spot eval: $eval") if isdbg('searcheval');
+       
 
        $fp->close;                                     # close any open files
 
@@ -287,9 +292,44 @@ sub ftor
 # format a spot for user output in list mode
 sub formatl
 {
-       my $t = ztime($_[2]);
-       my $d = cldate($_[2]);
-       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, $_[3], "<$_[4]" ;
+       my $spot = ref $_[0] ? shift : \@_;
+
+       my $t = ztime($spot->[2]);
+       my $d = cldate($spot->[2]);
+       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $spot->[0], $spot->[1], $d, $t, $spot->[3], "<$spot->[4]" ;
+}
+
+# format a spot for normal output
+sub format_dx_spot
+{
+       my $dxchan = shift;
+       my $spot = ref $_[0] ? shift : \@_;
+       
+       my $t = ztime($spot->[2]);
+       my $loc = '';
+       my $clth = $dxchan->{consort} eq 'local' ? 29 : 30;
+       my $comment = substr $spot->[3], 0, $clth; 
+       $comment .= ' ' x ($clth - length($comment));
+       if ($dxchan->{user}->wantgrid) { 
+               my $ref = DXUser->get_current($spot->[4]);
+               if ($ref) {
+                       $loc = $ref->qra || '';
+                       $loc = ' ' . substr($loc, 0, 4) if $loc;
+               }
+       }
+
+       if ($dxchan->{user}->wantdxitu) {
+               $loc = ' ' . sprintf("%2d", $spot->[10]) if defined $spot->[10];
+               $comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[8]) if defined $spot->[8]; 
+       } elsif ($dxchan->{user}->wantdxcq) {
+               $loc = ' ' . sprintf("%2d", $spot->[11]) if defined $spot->[11];
+               $comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[9]) if defined $spot->[9]; 
+       } elsif ($dxchan->{user}->wantusstate) {
+               $loc = ' ' . $spot->[13] if $spot->[13];
+               $comment = substr($comment, 0,  $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . $spot->[12] if $spot->[12]; 
+       }
+
+       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$spot->[4]:", $spot->[0], $spot->[1], $comment;
 }
 
 #