added the state filtering stuff

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 80d345ed69e19f716f6a258762e616c221e89817..982f8db5e19b51dadcfe088adea403b969b58b23 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -50,9 +50,12 @@ $filterdef = bless ([
                          ['call_zone', 'nz', 9],
                          ['by_itu', 'ni', 10],
                          ['by_zone', 'nz', 11],
-                         ['channel', 'c', 12],
+                         ['call_state', 'ns', 12],
+                         ['by_state', 'ns', 13],
+                         ['channel', 'c', 14],
+                                        
                         ], 'Filter::Cmd');
-
+$totalspots = $hfspots = $vhfspots = 0;
 
 # create a Spot Object
 sub new
@@ -97,8 +100,9 @@ sub init
 {
        mkdir "$dirprefix", 0777 if !-e "$dirprefix";
        $fp = DXLog::new($dirprefix, "dat", 'd');
-       $statp = DXLog::new($dirprefix, "cys", 'd');
-       system("rm -f $main::data/$dirprefix/2001/*.bys");
+       $statp = DXLog::new($dirprefix, "dys", 'd');
+       system("rm -f $main::data/$dirprefix/200?/*.bys");
+       system("rm -f $main::data/$dirprefix/200?/*.cys");
 }
 
 sub prefix
@@ -121,19 +125,28 @@ sub prepare
        # 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]);
-       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;
+       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]);
-       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;
+       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;
        push @out, $_[5];
-       return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
+       return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq, $spotted_state, $spotter_state);
 }
 
 sub add
@@ -303,7 +316,11 @@ sub dup
 
        # dump if too old
        return 2 if $d < $main::systime - $dupage;
- 
+       
+       # turn the time into minutes (should be already but...)
+       $d = int ($d / 60);
+       $d *= 60;
+
        $freq = sprintf "%.1f", $freq;       # normalise frequency
        $call = substr($call, 0, 12) if length $call > 12;
        chomp $text;
@@ -312,7 +329,7 @@ sub dup
        unpad($text);
        $text = pack("C*", map {$_ & 127} unpack("C*", $text));
        $text =~ s/[^a-zA-Z0-9]//g;
-       for (0,60,120,180,240,300) {
+       for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
                my $dt = $d - $_;
                my $dupkey = "X$freq|$call|$dt|\L$text";
                return 1 if DXDupe::find($dupkey);
@@ -332,33 +349,13 @@ sub genstats($)
        my $date = shift;
        my $in = $fp->open($date);
        my $out = $statp->open($date, 'w');
-       my @freq = (
-                               [0, Bands::get_freq('160m')],
-                               [1, Bands::get_freq('80m')],
-                               [2, Bands::get_freq('40m')],
-                               [3, Bands::get_freq('30m')],
-                               [4, Bands::get_freq('20m')],
-                               [5, Bands::get_freq('17m')],
-                               [6, Bands::get_freq('15m')],
-                               [7, Bands::get_freq('12m')],
-                               [8, Bands::get_freq('10m')],
-                               [9, Bands::get_freq('6m')],
-                               [10, Bands::get_freq('4m')],
-                               [11, Bands::get_freq('2m')],
-                               [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 @freq;
        my %list;
        my @tot;
        
        if ($in && $out) {
+               my $i = 0;
+               @freq = map {[$i++, Bands::get_freq($_)]} qw(136khz 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m 6m 4m 2m 220 70cm 23cm 13cm 9cm 6cm 3cm 12mm 6mm);
                while (<$in>) {
                        chomp;
                        my ($freq, $by, $dxcc) = (split /\^/)[0,4,6];
@@ -375,7 +372,6 @@ sub genstats($)
                        }
                }
 
-               my $i;
                for ($i = 0; $i < @freq+2; $i++) {
                        $tot[$i] ||= 0;
                }