On 22/12/2018 18:45, Joe Taylor wrote:
i3.n3 Err Message to be encoded Decoded message
--------------------------------------------------------------------------------
1. * DU6/VA3AAA K9ABC RRR VA3AAA K9ABC RRR
2. * DU6/PA3AAA K9ABC RRR PA3AAA/P K9ABC RRR
1. <DU6/VA3AAA> K9ABC RRR <DU6/VA3AAA> K9ABC RRR
2. <DU6/PA3AAA> K9ABC RRR <DU6/PA3AAA> K9ABC RRR
Hi Igor,
further to Joe's comments above the last line I have quited is a defect
although the message will be encoded and decoded without issue. We will
make changes to ensure this message and ones like it are encoded with
i3==1 as it should be. The change is attached as a diff for your review.
Thanks for catching this subtle issue.
73
Bill
G4WJS.
commit e4700b449e694be01017cb7f7686990063607f1d
Author: Bill Somerville <b...@classdesign.com>
Date: Mon Dec 24 02:22:39 2018 +0000
Make checks for /P and /R exact and only for trailing suffixes
diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90
index 7dd541a13..958c4af09 100644
--- a/lib/77bit/packjt77.f90
+++ b/lib/77bit/packjt77.f90
@@ -816,17 +816,14 @@ subroutine pack77_02(nwords,w,i3,n3,c77)
if(nwords.ge.2) read(w(nwords-1),*,err=2) nx
2 if(nx.lt.520001 .or. nx.gt.594095) return !Exchange between 520001 -
594095
if(.not.is_grid6(w(nwords)(1:6))) return !Last word must be a valid
grid6
+ i=index(w(1)//' ','/P ')
+ if(i.lt.4) return !Only exactly a trailing /P allowed
! Type 0.2: PA3XYZ/P R 590003 IO91NP 28 1 1 3 12 25 70 EU VHF
contest
i3=0
- n3=2
- ip=0
- c13=w(1)
- i=index(w(1),'/P')
- if(i.ge.4) then
- ip=1
- c13=w(1)(1:i-1)//' '
- endif
+ n3=21
+ ip=1
+ c13=w(1)(1:i-1)
call pack28(c13,n28a)
ir=0
if(w(2)(1:2).eq.'R ') ir=1
@@ -967,11 +964,13 @@ subroutine pack77_1(nwords,w,i3,n3,c77)
! 1 WA9XYZ/R KA1ABC/R R FN42 28 1 28 1 1 15 74 Standard msg
! 2 PA3XYZ/P GM4ABC/P R JO22 28 1 28 1 1 15 74 EU VHF
contest
-10 if(nwords.eq.2 .or. nwords.eq.3 .or. (nwords.eq.4 .and. &
- w(3)(1:2).eq.'R ')) then
+10 i1psuffix=index(w(1)//' ' ,'/P ')
+ i2psuffix=index(w(2)//' ','/P ')
+ if(nwords.eq.2 .or. nwords.eq.3 .or. (nwords.eq.4 .and. &
+ w(3)(1:2).eq.'R ')) then
n3=0
i3=1 !Type 1: Standard message, possibly with
"/R"
- if(index(w(1),'/P').ge.4 .or. index(w(2),'/P').ge.4) i3=2 !Type 2, with
"/P"
+ if (i1psuffix.ge.4.or.i2psuffix.ge.4) i3=2 !Type 2, with "/P"
endif
c13=bcall_1//' '
if(c13(1:3).eq.'CQ_' .or. w(1)(1:1).eq.'<') c13=w(1)
@@ -981,8 +980,8 @@ subroutine pack77_1(nwords,w,i3,n3,c77)
call pack28(c13,n28b)
ipa=0
ipb=0
- if(index(w(1),'/P').ge.4 .or. index(w(1),'/R').ge.4) ipa=1
- if(index(w(2),'/P').ge.4 .or. index(w(2),'/R').ge.4) ipb=1
+ if(i1psuffix.ge.4.or.index(w(1)//' ','/R ').ge.4) ipa=1
+ if(i2psuffix.ge.4.or.index(w(2)//' ','/R ').ge.4) ipb=1
grid4=w(nwords)(1:4)
if(is_grid4(grid4)) then
_______________________________________________
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
