X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FWCY.pm;h=f3202dd4c7451dbe536385dd20a672bccffc37a2;hb=01ba3df164dca5b803527a4b7db6e5d36a334f91;hp=acc522bd5a76f0abbd873c9828cf72ed488f9e6c;hpb=f155969d600561b9ef151a7ce2494a0c89aed033;p=spider.git

diff --git a/perl/WCY.pm b/perl/WCY.pm
index acc522bd..f3202dd4 100644
--- a/perl/WCY.pm
+++ b/perl/WCY.pm
@@ -20,7 +20,7 @@ use Data::Dumper;
 use strict;
 use vars qw($date $sfi $k $expk $a $r $sa $gmf $au  @allowed @denied $fp $node $from 
             $dirprefix $param
-            %dup $duplth $dupage);
+            $duplth $dupage);
 
 $fp = 0;						# the DXLog fcb
 $date = 0;						# the unix time of the WWV (notional)
@@ -35,7 +35,6 @@ $node = "";						# originating node
 $from = "";						# who this came from
 @allowed = ();					# if present only these callsigns are regarded as valid WWV updators
 @denied = ();					# if present ignore any wwv from these callsigns
-%dup = ();						# the spot duplicates hash
 $duplth = 20;					# the length of text to use in the deduping
 $dupage = 12*3600;				# the length of time to hold spot dups
 
@@ -227,32 +226,13 @@ sub dup
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
  
-	$d /= 60;                            # to the nearest minute
-#	chomp $text;
-#	$text = substr($text, 0, $duplth) if length $text > $duplth; 
-	my $dupkey = "$d|$sfi|$k|$a|$r";
-	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;
-	}
+	my $dupkey = "C$d|$sfi|$k|$a|$r";
+	return DXDupe::check($dupkey, $main::systime+$dupage);
 }
 
 sub listdups
 {
-	my @out;
-	for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
-		my $val = $dup{$_};
-		push @out, "$_ = $val (" . cldatetime($val) . ")";
-	}
-	return @out;
+	return DXDupe::listdups('C', $dupage, @_);
 }
 1;
 __END__;