X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=24124f5a3184e6b826800cb036c40a2f79e9d77a;hb=refs%2Fheads%2Fstaging;hp=89fdec5b8460dc7b1465d382f144d73b54a51600;hpb=b55a5be0062fb96613a2f42c25de550d69283b7a;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 89fdec5b..24124f5a 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -347,6 +347,7 @@ sub search
 	dbg("Spot::search hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search');
   
 	# build up eval to execute
+
 	dbg("Spot::search Spot eval: $expr") if isdbg('searcheval');
 	$expr =~ s/\$r/\$_[0]/g;
 	my $eval = qq{ sub { return $expr; } };
@@ -354,7 +355,6 @@ sub search
 	my $ecode = eval $eval;
 	return ("Spot search error", $@) if $@;
 	
-	
 	my $fh;
 	my $now = $fromdate;
 	my $today = Julian::Day->new($main::systime);
@@ -476,12 +476,12 @@ sub formatl
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
-	my ($freq, $call, $d, $text, $by, $node) = @_; 
+	my ($freq, $call, $d, $text, $by, $node, $just_find) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
-	
-	# turn the time into minutes (should be already but...)
+
+		# turn the time into minutes (should be already but...)
 	$d = int ($d / 60);
 	$d *= 60;
 
@@ -502,31 +502,37 @@ sub dup
 	$text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure!
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
 	my $ldupkey = "X$|$call|$by|$node|$freq|$d|$text";
+
 	my $t = DXDupe::find($ldupkey);
 	return 1 if $t && $t - $main::systime > 0;
 	
-	DXDupe::add($ldupkey, $main::systime+$dupage);
+	DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;
 	$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);
+		DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;
 	}
 	return undef;
 }
 
+sub dup_find
+{
+	return dup(@_, 1);
+}
+
 sub listdups
 {
 	return DXDupe::listdups('X', $dupage, @_);
 }
 
-sub genstats($)
+sub genstats
 {
 	my $date = shift;
-	my $in = $fp->open($date);
-	my $out = $statp->open($date, 'w');
+	my $in = $fp->open($date) or dbg("Spot::genstats: Cannot open " . $fp->fn($date) . " $!");
+	my $out = $statp->open($date, 'w') or dbg("Spot::genstats: Cannot open " . $statp->fn($date) . " $!");
 	my @freq;
 	my %list;
 	my @tot;
@@ -569,7 +575,7 @@ sub genstats($)
 }
 
 # return true if the stat file is newer than than the spot file
-sub checkstats($)
+sub checkstats
 {
 	my $date = shift;
 	my $in = $fp->mtime($date);