projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix IP addresses on multiple entries in PC92 A
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index 75903f02912e25b2d0c29b808635a8779f799415..f01a1481cc0a06681bc3ceccc065809f0c63f20e 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-11,7
+11,7
@@
package DXProt;
package DXProt;
-@ISA = qw(DX
Prot DX
Channel);
+@ISA = qw(DXChannel);
use DXUtil;
use DXM;
use DXUtil;
use DXM;
@@
-19,9
+19,10
@@
use DXDebug;
use strict;
use strict;
-use vars qw($sentencelth $pc19_version);
+use vars qw($sentencelth $pc19_version
$pc9x_nodupe_first_slot
);
$sentencelth = 180;
$sentencelth = 180;
+$pc9x_nodupe_first_slot = 1;
#
# All the PCxx generation routines
#
# All the PCxx generation routines
@@
-378,9
+379,13
@@
sub _gen_pc92
my $sort = shift;
my $ext = shift;
my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^$sort";
my $sort = shift;
my $ext = shift;
my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^$sort";
+ if ($pc9x_nodupe_first_slot && ($sort eq 'A' || $sort eq 'D') && $_[0]->call eq $main::mycall) {
+ shift;
+ $s .= '^';
+ }
for (@_) {
for (@_) {
- $s .=
"^"
. _encode_pc92_call($_, $ext);
- $ext = 0
;
# only the first slot has an ext.
+ $s .=
'^'
. _encode_pc92_call($_, $ext);
+ $ext = 0
unless $sort eq 'A';
# only the first slot has an ext.
}
return $s . '^H99^';
}
}
return $s . '^H99^';
}
@@
-392,6
+397,10
@@
sub gen_pc92_with_time
my $t = shift;
my $ext = 1;
my $s = "PC92^$call^$t^$sort";
my $t = shift;
my $ext = 1;
my $s = "PC92^$call^$t^$sort";
+ if ($pc9x_nodupe_first_slot && ($sort eq 'A' || $sort eq 'D') && $_[0]->call eq $main::mycall) {
+ shift;
+ $s .= '^';
+ }
for (@_) {
$s .= "^" . _encode_pc92_call($_, $ext);
}
for (@_) {
$s .= "^" . _encode_pc92_call($_, $ext);
}
@@
-401,7
+410,7
@@
sub gen_pc92_with_time
# add a local one
sub pc92a
{
# add a local one
sub pc92a
{
- return _gen_pc92('A',
0
, @_);
+ return _gen_pc92('A',
2
, @_);
}
# delete a local one
}
# delete a local one
@@
-421,7
+430,7
@@
sub pc92k
{
my $nref = shift;
my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^K";
{
my $nref = shift;
my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^K";
- $s .= "^" . _encode_pc92_call($nref, 1);
+ $s .= "^" . _encode_pc92_call($nref, 1)
. ":$main::me->{build}"
;
$s .= "^" . scalar $nref->nodes;
$s .= "^" . scalar $nref->users;
return $s . '^H99^';
$s .= "^" . scalar $nref->nodes;
$s .= "^" . scalar $nref->users;
return $s . '^H99^';