some cosmetic changes

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6a82cb16dc02d6facf3e7fac7f03e8e836784117..ecb6cfc638edad38d15fc4b509fb838cc748b595 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -27,11 +27,9 @@ use Local;
 use DXDb;
 use Time::HiRes qw(gettimeofday tv_interval);
 
-use Carp;
-
 use strict;
 use vars qw($me $pc11_max_age $pc23_max_age $pc11_dup_age $pc23_dup_age
-                       %spotdup %wwvdup $last_hour %pings %rcmds
+                       %spotdup %wwvdup $last_hour %pings %rcmds $pc11duptext
                        %nodehops @baddx $baddxfn $pc12_dup_age
                        %anndup $allowzero $pc12_dup_lth $decode_dk0wcy);
 
@@ -43,6 +41,8 @@ $pc11_dup_age = 3*3600;                       # the maximum time to keep the spot dup list for
 $pc23_dup_age = 3*3600;                        # the maximum time to keep the wwv dup list for
 $pc12_dup_age = 24*3600;               # the maximum time to keep the ann dup list for
 $pc12_dup_lth = 60;                            # the length of ANN text to save for deduping 
+$pc11duptext = 20;                             # maximum lth of the text field in PC11 to use for duduping
+
 %spotdup = ();                             # the pc11 and 26 dup hash 
 %wwvdup = ();                              # the pc23 and 27 dup hash
 %anndup = ();                               # the PC12 dup hash
@@ -72,7 +72,8 @@ sub init
        @today = Julian::sub(@today, 1);
        push @spots, Spot::readfile(@today);
        for (@spots) {
-               my $dupkey = "$_->[0]$_->[1]$_->[2]$_->[3]$_->[4]";
+               my $duptext = length $_->[3] > $pc11duptext ? substr($_->[3], 0, $pc11duptext) : $_->[3] ;
+               my $dupkey = "$_->[0]$_->[1]$_->[2]$duptext$_->[4]";
                $spotdup{$dupkey} = $_->[2];
        }
 
@@ -230,6 +231,7 @@ sub normal
                        }
 
                        # strip off the leading & trailing spaces from the comment
+                       my $duptext = length $field[5] > $pc11duptext ? substr($field[5], 0, $pc11duptext) : $field[5];
                        my $text = unpad($field[5]);
                        
                        # store it away