can use Sourceforge now!

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 75e34c116a7e7e2f11bb21047637eb37dc01ba63..fcf2d261a154f9c2e74b37e168183b5039079431 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -8,28 +8,30 @@
 
 package Spot;
 
-use FileHandle;
+use IO::File;
 use DXVars;
 use DXDebug;
 use DXUtil;
 use DXLog;
 use Julian;
 use Prefix;
-use Carp;
 
 use strict;
-use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix);
+use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix %dup $duplth $dupage);
 
 $fp = undef;
 $maxspots = 50;                                        # maximum spots to return
 $defaultspots = 10;                            # normal number of spots to return
 $maxdays = 35;                                 # normal maximum no of days to go back
 $dirprefix = "spots";
+%dup = ();                                             # the spot duplicates hash
+$duplth = 20;                                  # the length of text to use in the deduping
+$dupage = 3*3600;               # the length of time to hold spot dups
 
 sub init
 {
        mkdir "$dirprefix", 0777 if !-e "$dirprefix";
-       $fp = DXLog::new($dirprefix, "dat", 'd')
+       $fp = DXLog::new($dirprefix, "dat", 'd');
 }
 
 sub prefix
@@ -42,14 +44,16 @@ sub add
 {
        my @spot = @_;                          # $freq, $call, $t, $comment, $spotter = @_
        my @out = @spot[0..4];      # just up to the spotter
-       
-       # sure that the numeric things are numeric now (saves time later)
-       $spot[0] = 0 + $spot[0];
-       $spot[2] = 0 + $spot[2];
+
+       # normalise frequency
+       $spot[0] = sprintf "%.f", $spot[0];
   
        # remove ssids if present on spotter
        $out[4] =~ s/-\d+$//o;
 
+       # remove leading and trailing spaces
+       $spot[3] = unpad($spot[3]);
+       
        # 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;
@@ -105,7 +109,7 @@ sub search
        my $ref;
        my $i;
        my $count;
-       my @today = Julian::unixtoj(time);
+       my @today = Julian::unixtoj(time());
        my @fromdate;
        my @todate;
 
@@ -140,7 +144,7 @@ sub search
 
        $fp->close;                                     # close any open files
 
-       for ($i = 0; $i < $maxdays; ++$i) {     # look thru $maxdays worth of files only
+       for ($i = $count = 0; $i < $maxdays; ++$i) {    # look thru $maxdays worth of files only
                my @now = Julian::sub(@fromdate, $i); # but you can pick which $maxdays worth
                last if Julian::cmp(@now, @todate) <= 0;         
        
@@ -166,7 +170,11 @@ sub formatb
 {
        my @dx = @_;
        my $t = ztime($dx[2]);
-       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-30s %s", "$dx[4]:", $dx[0], $dx[1], $dx[3], $t ;
+       my $ref = DXUser->get_current($dx[4]);
+       my $loc = $ref->qra if $ref && $ref->qra;
+       $loc = substr($ref->qra, 0, 4) if $loc;
+       $loc = "" unless $loc;
+       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-30s %s $loc", "$dx[4]:", $dx[0], $dx[1], $dx[3], $t ;
 }
 
 # format a spot for user output in list mode
@@ -195,4 +203,45 @@ sub readfile
        }
        return @spots;
 }
+
+# enter the spot for dup checking and return true if it is already a dup
+sub dup
+{
+       my ($freq, $call, $d, $text) = @_; 
+
+       # dump if too old
+       return 2 if $d < $main::systime - $dupage;
+ 
+       $freq = sprintf "%.1f", $freq;       # normalise frequency
+       chomp $text;
+       $text = substr($text, 0, $duplth) if length $text > $duplth; 
+       unpad($text);
+       my $dupkey = "$freq|$call|$d|$text";
+       return 1 if exists $dup{$dupkey};
+       $dup{$dupkey} = $d * 60;         # in seconds (to the nearest minute)
+       return 0; 
+}
+
+# called every hour and cleans out the dup cache
+sub process
+{
+       my $cutoff = $main::systime - $dupage;
+       while (my ($key, $val) = each %dup) {
+               delete $dup{$key} if $val < $cutoff;
+       }
+}
+
+sub listdups
+{
+       my @out;
+       for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
+               my $val = $dup{$_};
+               push @out, "$_ = $val (" . cldatetime($val) . ")";
+       }
+       return @out;
+}
 1;
+
+
+
+