From 2c57e5577630b2cc49fe831ff5cf3b49b9629567 Mon Sep 17 00:00:00 2001 From: minima Date: Tue, 19 Feb 2002 21:44:50 +0000 Subject: [PATCH] fix deduping before input filtering --- Changes | 2 ++ perl/DXProt.pm | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Changes b/Changes index abccb1bd..bf4ff2a2 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +19Feb02======================================================================= +1. move the PC11 dup check after the input filter 06Feb02======================================================================= 1. changes to manuals to (hopefully) improve documentation and alter my email address (g0vgs) diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 2027239b..6c18a830 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -441,11 +441,6 @@ sub normal return; } } - - if (Spot::dup($field[1], $field[2], $d, $field[5])) { - dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr'); - return; - } my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]); @@ -458,6 +453,14 @@ sub normal } } + # 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; + } + # add it Spot::add(@spot); -- 2.43.0