From 81af6f1ed3e06b7d3058347d1b4774346f4737c0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 31 Aug 2018 11:22:06 -0400 Subject: [PATCH] Fix minor flaws in reporting bad messages by jt65code and jt9code. --- lib/jt65code.f90 | 8 +++++--- lib/jt9code.f90 | 8 +++++--- lib/testmsg.f90 | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/jt65code.f90 b/lib/jt65code.f90 index f49c57a01..d3dac07d1 100644 --- a/lib/jt65code.f90 +++ b/lib/jt65code.f90 @@ -82,10 +82,12 @@ program JT65code call fmtmsg(decoded,iz) 10 bad=" " - if(decoded.ne.msgchk) bad="*" expected = 'EXACT' - if (msg0.ne.msgchk) expected = 'TRUNCATED' - if (nmsg.eq.1) expected = 'UNKNOWN' + if(decoded.ne.msg0) then + bad="*" + if(decoded(1:13).eq.msg0(1:13) .and. & + decoded(14:22).eq. ' ') expected = 'TRUNCATED' + endif write(*,1020) imsg,msg0,decoded,bad,itype,msgtype,expected 1020 format(i2,'.',1x,a22,1x,a22,1x,a1,i3,":",a10,2x,a22) enddo diff --git a/lib/jt9code.f90 b/lib/jt9code.f90 index 5a4b4fc83..0ab96d85c 100644 --- a/lib/jt9code.f90 +++ b/lib/jt9code.f90 @@ -71,9 +71,11 @@ program jt9code 10 bad=" " expected = 'EXACT' - if (msg0.ne.msgchk) expected = 'TRUNCATED' - if (nmsg.eq.1) expected = 'UNKNOWN' - if(decoded.ne.msgchk) bad="*" + if(decoded.ne.msg0) then + bad="*" + if(decoded(1:13).eq.msg0(1:13) .and. & + decoded(14:22).eq. ' ') expected = 'TRUNCATED' + endif write(*,1020) imsg,msg0,decoded,bad,itype,msgtype,expected 1020 format(i2,'.',1x,a22,1x,a22,1x,a1,i3,":",a10,2x,a22) enddo diff --git a/lib/testmsg.f90 b/lib/testmsg.f90 index 661c390a3..eae851d61 100644 --- a/lib/testmsg.f90 +++ b/lib/testmsg.f90 @@ -16,7 +16,7 @@ "KA1ABC WB9XYZ RRR", & "KA1ABC WB9XYZ 73", & "KA1ABC WB9XYZ", & - "CQ 000 WB9XYZ EN34", & + "CQ 010 WB9XYZ EN34", & "CQ 999 WB9XYZ EN34", & "CQ EU WB9XYZ EN34", & "CQ WY WB9XYZ EN34", &