projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
49a1420
)
move the eph_dups for PC17 and 21
author
minima
<minima>
Mon, 1 Apr 2002 16:29:50 +0000
(16:29 +0000)
committer
minima
<minima>
Mon, 1 Apr 2002 16:29:50 +0000
(16:29 +0000)
perl/DXProt.pm
patch
|
blob
|
history
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 5ab4186b2c64cb6e8082f5b57800a4c61dc30a82..e07e3ba04f179a13e7431ceb799cc5a4a556de4c 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-668,11
+668,6
@@
sub normal
my $ncall = $field[2];
my $ucall = $field[1];
my $ncall = $field[2];
my $ucall = $field[1];
- if (eph_dup($line)) {
- dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
- return;
- }
-
eph_del_regex("^PC16\\^$ncall.*$ucall");
if ($ncall eq $main::mycall) {
eph_del_regex("^PC16\\^$ncall.*$ucall");
if ($ncall eq $main::mycall) {
@@
-701,6
+696,12
@@
sub normal
return unless $self->in_filter_route($parent);
$parent->del_user($uref);
return unless $self->in_filter_route($parent);
$parent->del_user($uref);
+
+ if (eph_dup($line)) {
+ dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
+ return;
+ }
+
$self->route_pc17($parent, $uref);
return;
}
$self->route_pc17($parent, $uref);
return;
}
@@
-825,11
+826,8
@@
sub normal
if ($pcno == 21) { # delete a cluster from the list
my $call = uc $field[1];
if ($pcno == 21) { # delete a cluster from the list
my $call = uc $field[1];
- if (eph_dup($line)) {
- dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
- return;
- }
-
+ eph_del_regex("^PC1[79].*$call");
+
# if I get a PC21 from the same callsign as self then treat it
# as a PC39: I have gone away
if ($call eq $self->call) {
# if I get a PC21 from the same callsign as self then treat it
# as a PC39: I have gone away
if ($call eq $self->call) {
@@
-837,8
+835,6
@@
sub normal
return;
}
return;
}
- eph_del_regex("^PC1[79].*$call");
-
my @rout;
my $parent = Route::Node::get($self->{call});
unless ($parent) {
my @rout;
my $parent = Route::Node::get($self->{call});
unless ($parent) {
@@
-867,6
+863,11
@@
sub normal
return;
}
return;
}
+# if (eph_dup($line)) {
+# dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
+# return;
+# }
+
$self->route_pc21(@rout) if @rout;
return;
}
$self->route_pc21(@rout) if @rout;
return;
}