fix deduping before input filtering

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4c8a70564f5df1107933fcc7d075f0dc6a8af8b5..6c18a83052329dcddf29c42d149e38fd94d1e898 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -63,7 +63,7 @@ $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
 $rspfcheck = 1;
 $eph_restime = 180;
-$eph_info_restime = 10*60;
+$eph_info_restime = 60*60;
 $eph_pc34_restime = 30;
 
 @checklist = 
@@ -442,6 +442,7 @@ sub normal
                                }
                        }
 
+
                        my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
                        # global spot filtering on INPUT
                        if ($self->{inspotsfilter}) {
@@ -451,7 +452,10 @@ sub normal
                                        return;
                                }
                        }
-                       
+
+                       # this goes after the input filtering, but before the add
+                       # so that if it is input filtered, it isn't added to the dup
+                       # list. This allows it to come in from a "legitimate" source
                        if (Spot::dup($field[1], $field[2], $d, $field[5])) {
                                dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
                                return;
@@ -1966,5 +1970,10 @@ sub eph_list
        }
        return @out;
 }
+
+sub run_cmd
+{
+       goto &DXCommandmode::run_cmd;
+}
 1;
 __END__