fix free talking in command mode

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index d52575afbcc8ce25a1870aff607e8da1356c1443..0df6891799dd8a3006da9c2a1c1880fcc16a86b6 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -22,10 +22,8 @@ use QSL;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth);
 
@@ -103,6 +101,58 @@ sub init
        mkdir "$dirprefix", 0777 if !-e "$dirprefix";
        $fp = DXLog::new($dirprefix, "dat", 'd');
        $statp = DXLog::new($dirprefix, "dys", 'd');
+
+       # load up any old spots 
+       if ($main::dbh) {
+               unless (grep $_ eq 'spot', $main::dbh->show_tables) {
+                       dbg('initialising spot tables');
+                       my $t = time;
+                       my $total;
+                       $main::dbh->spot_create_table;
+                       
+                       my $now = Julian::Day->alloc(1995, 0);
+                       my $today = Julian::Day->new(time);
+                       my $sth = $main::dbh->spot_insert_prepare;
+                       $main::dbh->{RaiseError} = 0;
+                       while ($now->cmp($today) <= 0) {
+                               my $fh = $fp->open($now);
+                               if ($fh) {
+                                       my $count = 0;
+                                       while (<$fh>) {
+                                               chomp;
+                                               my @s = split /\^/;
+                                               if (@s < 12) {
+                                                       my @a = (Prefix::cty_data($s[1]))[1..3];
+                                                       my @b = (Prefix::cty_data($s[4]))[1..3];
+                                                       push @s, $b[1] if @s < 7;
+                                                       push @s, '' if @s < 8;
+                                                       push @s, @a[0,1], @b[0,1] if @s < 12;
+                                                       push @s,  $a[2], $a[2] if @s < 14;  
+                                               } 
+                                               
+                                               push @s, undef while @s < 14;
+                                               pop @s while @s > 14;
+
+                                               $main::dbh->spot_insert(\@s, $sth);
+                                               $count++;
+                                       }
+                                       $main::dbh->commit if $count;
+                                       $main::dbh->{RaiseError} = 0;
+                                       dbg("inserted $count spots from $now->[0] $now->[1]");
+                                       $fh->close;
+                                       $total += $count;
+                               }
+                               $now = $now->add(1);
+                       }
+                       $main::dbh->spot_add_indexes;
+                       $main::dbh->commit;
+                       $main::dbh->{RaiseError} = 1;
+                       $t = time - $t;
+                       my $min = int($t / 60);
+                       my $sec = $t % 60;
+                       dbg("$total spots converted in $min:$sec");
+               }
+       }
 }
 
 sub prefix
@@ -117,13 +167,13 @@ sub prepare
        my @out = @_[0..4];      # just up to the spotter
 
        # normalise frequency
-       $_[0] = sprintf "%.1f", $_[0];
+       $out[0] = sprintf "%.1f", $out[0];
   
        # remove ssids and /xxx if present on spotter
        $out[4] =~ s/-\d+$//o;
 
        # remove leading and trailing spaces
-       $_[3] = unpad($_[3]);
+       $out[3] = unpad($out[3]);
        
        
        # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
@@ -139,6 +189,10 @@ sub add
 {
        my $buf = join('^', @_);
        $fp->writeunix($_[2], $buf);
+       if ($main::dbh) {
+               $main::dbh->spot_insert(\@_);
+               $main::dbh->commit;
+       }
        $totalspots++;
        if ($_[0] <= 30000) {
                $hfspots++;
@@ -200,6 +254,10 @@ sub search
        
        $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0;
 
+       if ($main::dbh) {
+               return $main::dbh->spot_search($expr, $dayfrom, $dayto, $to-$from, $dxchan);
+       }
+
        $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
   
@@ -209,6 +267,9 @@ sub search
                           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];  
+                      } else {
+                          \$s[12] ||= ' ';
+                          \$s[13] ||= ' ';
                       }
                          my (\$filter, \$hops) = \$dxchan->{spotsfilter}->it(\@s);
                          next unless (\$filter);
@@ -295,7 +356,7 @@ 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]" ;
+       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
 }
 
 #
@@ -331,7 +392,8 @@ sub dup
        # remove SSID or area
        $by =~ s|[-/]\d+$||;
        
-       $freq = sprintf "%.1f", $freq;       # normalise frequency
+#      $freq = sprintf "%.1f", $freq;       # normalise frequency
+       $freq = int $freq;       # normalise frequency
        $call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
 
        chomp $text;
@@ -343,17 +405,24 @@ sub dup
                        $text = "" if $cty == $try[0];
                }
        }
+       my $otext = $text;
+       $text =~ s/^\+\w+\s*//;                 # remove leading LoTW callsign
        $text = pack("C*", map {$_ & 127} unpack("C*", $text));
+       $text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
        $text =~ s/[^\w]//g;
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
        my $ldupkey = "X$freq|$call|$by|$text";
        my $t = DXDupe::find($ldupkey);
        return 1 if $t && $t - $main::systime > 0;
        DXDupe::add($ldupkey, $main::systime+$dupage);
-#      my $sdupkey = "X$freq|$call|$by";
-#      $t = DXDupe::find($sdupkey);
-#      return 1 if $t && $t - $main::systime > 0;      
-#      DXDupe::add($sdupkey, $main::systime+$dupage);
+       $otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
+       $otext =~ s/\s+$//;
+       if (length $otext && $otext ne $text) {
+               $ldupkey = "X$freq|$call|$by|$otext";
+               $t = DXDupe::find($ldupkey);
+               return 1 if $t && $t - $main::systime > 0;
+               DXDupe::add($ldupkey, $main::systime+$dupage);
+       }
        return 0;
 }