From: djk <djk>
Date: Tue, 20 Jun 2000 09:41:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: R_1_43~42
X-Git-Url: http://dxspider.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3761cb3e0997a63ca4611f0c684474dd9bc80c9a;p=spider.git

*** empty log message ***
---

diff --git a/Changes b/Changes
index 48c55d35..de0cdb9b 100644
--- 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
diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index df74bfc8..2758e64d 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -441,7 +441,7 @@ sub decode_input
 {
 	my $dxchan = shift;
 	my $data = shift;
-	my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z1-9\-]{3,9})\|(.*)$/;
+	my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z0-9\-]{3,9})\|(.*)$/;
 
 	my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
 	
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4d9942dd..a7cf9e6f 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -228,6 +228,7 @@ sub normal
 			}
 			
 			# 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;
@@ -260,6 +261,7 @@ sub normal
 		
 		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;