alter spacing at the end of a dx line slightly

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 78d2eda566c7536a0127ecb3a4f4eb2ae14f8e31..963ed4a5895945f9cbf2bf8a7f5bf0900e8a3b10 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -43,14 +43,14 @@ $filterdef = bless ([
                          ['call', 'c', 1],
                          ['info', 't', 3],
                          ['by', 'c', 4],
-                         ['call_dxcc', 'n', 5],
-                         ['by_dxcc', 'n', 6],
+                         ['call_dxcc', 'nc', 5],
+                         ['by_dxcc', 'nc', 6],
                          ['origin', 'c', 7, 9],
-                         ['call_itu', 'n', 8],
-                         ['call_zone', 'n', 9],
-                         ['by_itu', 'n', 10],
-                         ['by_zone', 'n', 11],
-                         ['channel', 'n', 12, 9],
+                         ['call_itu', 'ni', 8],
+                         ['call_zone', 'nz', 9],
+                         ['by_itu', 'ni', 10],
+                         ['by_zone', 'nz', 11],
+                         ['channel', 'c', 12],
                         ], 'Filter::Cmd');
 
 
@@ -97,7 +97,8 @@ sub init
 {
        mkdir "$dirprefix", 0777 if !-e "$dirprefix";
        $fp = DXLog::new($dirprefix, "dat", 'd');
-       $statp = DXLog::new($dirprefix, "bys", 'd');
+       $statp = DXLog::new($dirprefix, "cys", 'd');
+       system("rm -f $main::data/$dirprefix/2001/*.bys");
 }
 
 sub prefix
@@ -122,12 +123,12 @@ sub prepare
        
        # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
        my @dxcc = Prefix::extract($out[1]);
-       my $spotted_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0;
+       my $spotted_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 666;
        my $spotted_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
        my $spotted_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
        push @out, $spotted_dxcc;
        @dxcc = Prefix::extract($out[4]);
-       my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0;
+       my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 666;
        my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
        my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
        push @out, $spotter_dxcc;
@@ -250,7 +251,7 @@ sub ftor
        while (@b) {
                my $aa = shift @a;
                my $bb = shift @b;
-               if (@b < (length $d) - 1) {
+               if (@b < (length $d)) {
                        $out .= '\\d';
                } elsif ($aa eq $bb) {
                        $out .= $aa;
@@ -272,7 +273,7 @@ sub formatb
        my $loc = $ref->qra if $ref && $ref->qra && $wantgrid;
        $loc = ' ' . substr($ref->qra, 0, 4) if $loc;
        $loc = "" unless $loc;
-       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-30s %s$loc", "$_[4]:", $_[0], $_[1], $_[3], $t ;
+       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-29s %s$loc", "$_[4]:", $_[0], $_[1], $_[3], $t ;
 }
 
 # format a spot for user output in list mode
@@ -311,12 +312,19 @@ sub dup
  
        $freq = sprintf "%.1f", $freq;       # normalise frequency
        chomp $text;
+       $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
        unpad($text);
-       $text =~ s/[\\\%]\d+//g;
+       $text = pack("C*", map {$_ & 127} unpack("C*", $text));
        $text =~ s/[^a-zA-Z0-9]//g;
+       for (0,60,120,180,240,300) {
+               my $dt = $d - $_;
+               my $dupkey = "X$freq|$call|$dt|\L$text";
+               return 1 if DXDupe::find($dupkey);
+       }
        my $dupkey = "X$freq|$call|$d|\L$text";
-       return DXDupe::check($dupkey, $main::systime+$dupage);
+       DXDupe::add($dupkey, $main::systime+$dupage);
+       return 0;
 }
 
 sub listdups
@@ -342,13 +350,15 @@ sub genstats($)
                                [9, Bands::get_freq('6m')],
                                [10, Bands::get_freq('4m')],
                                [11, Bands::get_freq('2m')],
-                               [12, Bands::get_freq('70cm')],
-                               [13, Bands::get_freq('13cm')],
-                               [14, Bands::get_freq('9cm')],
-                               [15, Bands::get_freq('6cm')],
-                               [16, Bands::get_freq('3cm')],
-                               [17, Bands::get_freq('12mm')],
-                               [18, Bands::get_freq('6cm')],
+                               [12, Bands::get_freq('220')],
+                               [13, Bands::get_freq('70cm')],
+                               [14, Bands::get_freq('23cm')],
+                               [15, Bands::get_freq('13cm')],
+                               [16, Bands::get_freq('9cm')],
+                               [17, Bands::get_freq('6cm')],
+                               [18, Bands::get_freq('3cm')],
+                               [19, Bands::get_freq('12mm')],
+                               [20, Bands::get_freq('6cm')],
                           );
        my %list;
        my @tot;
@@ -374,7 +384,7 @@ sub genstats($)
                for ($i = 0; $i < @freq+2; $i++) {
                        $tot[$i] ||= 0;
                }
-               $out->write(join('^', 'TOTALS', @tot) . "\n");
+               $statp->write($date, join('^', 'TOTALS', @tot));
 
                for (sort {$list{$b}->[0] <=> $list{$a}->[0]} keys %list) {
                        my $ref = $list{$_};
@@ -382,9 +392,9 @@ sub genstats($)
                        for ($i = 0; $i < @freq+2; ++$i) {
                                $ref->[$i] ||= 0;
                        }
-                       $out->write(join('^', $call, @$ref) . "\n");
+                       $statp->write($date, join('^', $call, @$ref));
                }
-               $out->close;
+               $statp->close;
        }
 }