projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c6e056a
)
fix deduping before input filtering
author
minima
<minima>
Tue, 19 Feb 2002 21:44:50 +0000
(21:44 +0000)
committer
minima
<minima>
Tue, 19 Feb 2002 21:44:50 +0000
(21:44 +0000)
Changes
patch
|
blob
|
history
perl/DXProt.pm
patch
|
blob
|
history
diff --git
a/Changes
b/Changes
index abccb1bd38e0d39e701d036c78a8cac79b176570..bf4ff2a2577cddc1b2420fa866b17c3e892d675c 100644
(file)
--- 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)
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 2027239b6bac792fffec04499124181f3ff4aaea..6c18a83052329dcddf29c42d149e38fd94d1e898 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-441,11
+441,6
@@
sub normal
return;
}
}
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]);
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);
# add it
Spot::add(@spot);