X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=6ee0c4984a40799ccf9833e19ebe794d36ea930a;hb=624fab70a1d3994e74f7121c449b67c174afef29;hp=75903f02912e25b2d0c29b808635a8779f799415;hpb=937b3f6592ae13be16dfe171b30817ee39d27bf0;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 75903f02..6ee0c498 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -11,7 +11,7 @@ package DXProt; -@ISA = qw(DXProt DXChannel); +@ISA = qw(DXChannel); use DXUtil; use DXM; @@ -19,9 +19,10 @@ use DXDebug; use strict; -use vars qw($sentencelth $pc19_version); +use vars qw($sentencelth $pc19_version $pc9x_nodupe_first_slot); $sentencelth = 180; +$pc9x_nodupe_first_slot = 1; # # All the PCxx generation routines @@ -378,8 +379,12 @@ sub _gen_pc92 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 (@_) { - $s .= "^" . _encode_pc92_call($_, $ext); + $s .= '^' . _encode_pc92_call($_, $ext); $ext = 0; # only the first slot has an ext. } return $s . '^H99^'; @@ -392,6 +397,10 @@ sub gen_pc92_with_time 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); } @@ -421,7 +430,7 @@ sub pc92k { 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^';