1. make Spanish in set/lang & Messages 'es' instead of 'sp'

[spider.git] / perl / WCY.pm

diff --git a/perl/WCY.pm b/perl/WCY.pm
index bccf815b92f82556e07873471754a138d73c9039..4974d939620f51ad17b4865b05b0835457ed99a9 100644 (file)
--- a/perl/WCY.pm
+++ b/perl/WCY.pm
@@ -52,13 +52,13 @@ $filterdef = bless ([
                          # tag, sort, field, priv, special parser 
                          ['by', 'c', 11],
                          ['origin', 'c', 12],
-                         ['channel', 'n', 13],
-                         ['by_dxcc', 'n', 14],
-                         ['by_itu', 'n', 15],
-                         ['by_zone', 'n', 16],
-                         ['origin_dxcc', 'c', 17],
-                         ['origin_itu', 'c', 18],
-                         ['origin_itu', 'c', 19],
+                         ['channel', 'c', 13],
+                         ['by_dxcc', 'nc', 14],
+                         ['by_itu', 'ni', 15],
+                         ['by_zone', 'nz', 16],
+                         ['origin_dxcc', 'nc', 17],
+                         ['origin_itu', 'ni', 18],
+                         ['origin_zone', 'nz', 19],
                         ], 'Filter::Cmd');
 
 
@@ -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);
 }