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

[Jon Tai]

[Jon Tai (jontai)]

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.

[jeff.apple (jeff-apple)]

review: Approve

=== 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 @@
  Q HLIND1
  ;
 RDBLK S HLDB=HLDBSIZE-$L(HLX)
- U IO D:$D ERROR R X#HLDB:HLDREAD ; MSC/JDA added check against $DEVICE
+ ; MSC/JDA added check against $DEVICE
+ U IO D:$D ERROR
+ ; MSC/JKT set DELIMITER flag on GT.M to ensure we return from READ command as soon as we get a complete HL7 message
+ I $G(^%ZOSF("OS"))["GT.M" U IO:(DELIMITER=HLRS_HLDEND_HLRS)
+ N T R X#HLDB:HLDREAD S T=$T
+ ; MSC/JKT $KEY=delimiter if READ terminated on delimiter; remove DELIMITER flag after READ so we don't affect writes
+ I $G(^%ZOSF("OS"))["GT.M" S X=X_$KEY U IO:(NODELIMITER)
  ; timedout or error, check ack timeout, clean up
- I '$T,X="",HLX="" S HLACKWT=HLACKWT-HLDREAD D:HLACKWT<0&'HLHDR CLEAN Q
+ I 'T,X="",HLX="" S HLACKWT=HLACKWT-HLDREAD D:HLACKWT<0&'HLHDR CLEAN Q
  ;data stream: <sb>dddd<cr><eb><cr>
  ;add incoming line to what wasn't processed in last read
  S HLX=$G(HLX)_X