X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FWCY.pm;h=4974d939620f51ad17b4865b05b0835457ed99a9;hb=6a510dc82f3050640dfe6b8d499995348075fe7a;hp=85f2b8178bd8aad882cf8e976b2251d948bac1ce;hpb=5198a7d29d9dbafde9de46c04a67d86cf0e548f2;p=spider.git

diff --git a/perl/WCY.pm b/perl/WCY.pm
index 85f2b817..4974d939 100644
--- a/perl/WCY.pm
+++ b/perl/WCY.pm
@@ -90,8 +90,9 @@ sub store
 sub update
 {
 	my ($mydate, $mytime, $mysfi, $mya, $myk, $myexpk, $myr, $mysa, $mygmf, $myau, $myfrom, $mynode) = @_;
-	if ((@allowed && grep {$_ eq $from} @allowed) || 
-		(@denied && !grep {$_ eq $from} @denied) ||
+	$myfrom =~ s/-\d+$//;
+	if ((@allowed && grep {$_ eq $myfrom} @allowed) || 
+		(@denied && !grep {$_ eq $myfrom} @denied) ||
 		(@allowed == 0 && @denied == 0)) {
 		
 		#	my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
@@ -242,12 +243,12 @@ sub readfile
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
-	my ($d, $sfi, $a, $k, $r) = @_; 
+	my ($d) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
  
-	my $dupkey = "C$d|$sfi|$k|$a|$r";
+	my $dupkey = "C$d";
 	return DXDupe::check($dupkey, $main::systime+$dupage);
 }