Merge lp:~jontai/openvista-gtm-integration/bug526896 into lp:openvista-gtm-integration

Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug526896
Merge into: lp:openvista-gtm-integration
Prerequisite: lp:~jontai/openvista-gtm-integration/bug526734
Diff against target: 21 lines (+8/-2)
1 file modified
mumps/HLCSTCP1.m (+8/-2)
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug526896
Reviewer Review Type Date Requested Status
jeff.apple Approve
Review via email: mp+20043@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jon Tai (jontai) wrote :

Sorry for all the merge requests -- I wanted to tackle the specific issues we were encountered separately, even though the fix ends up all being in the same routine.

Revision history for this message
jeff.apple (jeff-apple) :
review: Approve
Revision history for this message
jeff.apple (jeff-apple) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mumps/HLCSTCP1.m'
--- mumps/HLCSTCP1.m 2010-02-24 08:56:22 +0000
+++ mumps/HLCSTCP1.m 2010-02-24 08:56:22 +0000
@@ -42,9 +42,15 @@
42 Q HLIND142 Q HLIND1
43 ;43 ;
44RDBLK S HLDB=HLDBSIZE-$L(HLX)44RDBLK S HLDB=HLDBSIZE-$L(HLX)
45 U IO D:$D ERROR R X#HLDB:HLDREAD ; MSC/JDA added check against $DEVICE45 ; MSC/JDA added check against $DEVICE
46 U IO D:$D ERROR
47 ; MSC/JKT set DELIMITER flag on GT.M to ensure we return from READ command as soon as we get a complete HL7 message
48 I $G(^%ZOSF("OS"))["GT.M" U IO:(DELIMITER=HLRS_HLDEND_HLRS)
49 N T R X#HLDB:HLDREAD S T=$T
50 ; MSC/JKT $KEY=delimiter if READ terminated on delimiter; remove DELIMITER flag after READ so we don't affect writes
51 I $G(^%ZOSF("OS"))["GT.M" S X=X_$KEY U IO:(NODELIMITER)
46 ; timedout or error, check ack timeout, clean up52 ; timedout or error, check ack timeout, clean up
47 I '$T,X="",HLX="" S HLACKWT=HLACKWT-HLDREAD D:HLACKWT<0&'HLHDR CLEAN Q53 I 'T,X="",HLX="" S HLACKWT=HLACKWT-HLDREAD D:HLACKWT<0&'HLHDR CLEAN Q
48 ;data stream: <sb>dddd<cr><eb><cr>54 ;data stream: <sb>dddd<cr><eb><cr>
49 ;add incoming line to what wasn't processed in last read55 ;add incoming line to what wasn't processed in last read
50 S HLX=$G(HLX)_X56 S HLX=$G(HLX)_X

Subscribers

People subscribed via source and target branches