projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
840ace6
)
*** empty log message ***
author
djk
<djk>
Tue, 20 Jun 2000 09:41:17 +0000
(09:41 +0000)
committer
djk
<djk>
Tue, 20 Jun 2000 09:41:17 +0000
(09:41 +0000)
Changes
patch
|
blob
|
history
perl/DXChannel.pm
patch
|
blob
|
history
perl/DXProt.pm
patch
|
blob
|
history
diff --git
a/Changes
b/Changes
index 48c55d357b8638f5b5b5382a83b1beac3a2422a5..de0cdb9bd3dc3fa907f75d7dd5ec519a1dea16e0 100644
(file)
--- a/
Changes
+++ b/
Changes
@@
-1,3
+1,5
@@
+20Jun00=======================================================================
+1. fixed decode_input so it accepts callsigns with 0 in them (!)
19Jun00=======================================================================
1. move ann_dup, spot_dup etc to dup_ann, dup_spots etc
2. made mode 3 the default line ending convention for all out going connects
19Jun00=======================================================================
1. move ann_dup, spot_dup etc to dup_ann, dup_spots etc
2. made mode 3 the default line ending convention for all out going connects
diff --git
a/perl/DXChannel.pm
b/perl/DXChannel.pm
index df74bfc89302fdf00f398735bd53df5b5985a546..2758e64dd3a1f8c54fd65998fbee065ee2f6a51a 100644
(file)
--- a/
perl/DXChannel.pm
+++ b/
perl/DXChannel.pm
@@
-441,7
+441,7
@@
sub decode_input
{
my $dxchan = shift;
my $data = shift;
{
my $dxchan = shift;
my $data = shift;
- my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z
1
-9\-]{3,9})\|(.*)$/;
+ my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z
0
-9\-]{3,9})\|(.*)$/;
my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 4d9942dda505daefaf2a1b69815a32dbf9a2a6a1..a7cf9e6f9d96952db58fd4b9c4b41f493f51833f 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-228,6
+228,7
@@
sub normal
}
# do some de-duping
}
# do some de-duping
+ $field[5] =~ s/^\s+//; # take any leading blanks off
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
dbg('chan', "Duplicate Spot ignored\n");
return;
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
dbg('chan', "Duplicate Spot ignored\n");
return;
@@
-260,6
+261,7
@@
sub normal
if ($pcno == 12) { # announces
# announce duplicate checking
if ($pcno == 12) { # announces
# announce duplicate checking
+ $field[3] =~ s/^\s+//; # remove leading blanks
if (AnnTalk::dup($field[1], $field[2], $field[3])) {
dbg('chan', "Duplicate Announce ignored\n");
return;
if (AnnTalk::dup($field[1], $field[2], $field[3])) {
dbg('chan', "Duplicate Announce ignored\n");
return;