ruby_astm 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e32a89f60fc8e6323b9de22d2b1511d8c28d3eca13e819c2195f47bb9e1707
-  data.tar.gz: b394691adcb1355a3715fb7646d352c791357f5a7668b3183209b1f33087b335
+  metadata.gz: c8929f2849304da9211d8a1bc5dda4f531d86b1efd93c0961c5911fd850b166c
+  data.tar.gz: 2582f498e916278c9795fbe3dd9438223e9c890eb19094c50ea8ca4b8bb38f7c
 SHA512:
-  metadata.gz: 28abc36250ca2dfaf2e429cac95a89c26585c13823ede3ed17c892423249245b3f2298f2c0a2e81bf452036f4b4cd99c73e49d63f2dbc78a4180bd7fa7dde161
-  data.tar.gz: f1b7cde59e37731392f1ab47014e78290ea2c801a65c0e9de21e335f9d17c46a231f7f5ef785bef6cbcbb6fc3399d866caa6a71d163c648c27e10b2cd83a85f6
+  metadata.gz: 1f646e07f6c22da4abc05758095158743b1e19995beff2f90392369e2445141a3afe2ea620bd977cedc0ec79cd6d2158f5b760c527aed13af401d56c7b3a8c30
+  data.tar.gz: da45a2cfd005e8353e5df652e536499876684f9cb7eff7f1d89b5d246f982ed640ea47355b838e4c367df545062cf62a7d74049ad4e73618009e05f2e6895926

data/lib/ruby_astm/lab_interface.rb

@@ -20,6 +20,7 @@ module LabInterface
   mattr_accessor :usb_port
   mattr_accessor :usb_baud
   mattr_accessor :usb_parity
+  mattr_accessor :mid_frame_end_detected
 
 
 
@@ -89,6 +90,18 @@ module LabInterface
     }
   end
 
+  def is_mid_frame_end?(bytes_array)
+    unless bytes_array.blank?
+      if bytes_array.size >= 6
+        if bytes_array[-6..-1] == [23,65,52,13,10,2]
+          self.mid_frame_end_detected = true
+          return self.mid_frame_end_detected
+        end
+      end
+    end
+    return false
+  end
+
 	def receive_data(data)
       
 
@@ -97,13 +110,32 @@ module LabInterface
 
       self.data_buffer ||= ''
 
-      puts "incoming data bytes."
+      #puts "incoming data bytes."
 
       concat = ""
       
-      puts data.bytes.to_a.to_s
+      #puts data.bytes.to_a.to_s
 
-      data.bytes.to_a.each do |byte|
+
+      ## if the bytes end in 13,10,2
+      ## that means frame ends and restarts
+      ## ignore those three bytes
+      byte_arr = data.bytes.to_a
+      #puts "byte arr is:"
+      #puts byte_arr
+
+      if is_mid_frame_end?(byte_arr)
+        #puts "mid frame end is true---------------!!!!!!!!!!"
+        byte_arr = byte_arr[0..-7]
+        #puts "byte arr BECOMES mid frame end is true---------------!!!!!!!!!!"
+        #puts byte_arr.pack('c*')
+      elsif self.mid_frame_end_detected == true
+        ## we ignore the frame number.
+        byte_arr = byte_arr[1..-1]
+        self.mid_frame_end_detected = false
+      end
+
+      byte_arr.each do |byte|
         x = [byte].pack('c*').force_encoding('UTF-8')
         if x == "\r"
           concat+="\n"
@@ -129,23 +161,23 @@ module LabInterface
       
 
       if data.bytes.to_a[-1] == 4
-        puts "GOT EOT --- PROCESSING BUFFER, AND CLEARING."
+        #puts "GOT EOT --- PROCESSING BUFFER, AND CLEARING."
         process_text(self.data_buffer)
         self.data_buffer = ''
         if self.headers[-1].queries.blank?
-          puts "no queries in header so sending ack after getting EOT and processing the buffer"
+          #puts "no queries in header so sending ack after getting EOT and processing the buffer"
           send_data(ACK)
         else
-          puts "sending ENQ"
+          #puts "sending ENQ"
           send_data(ENQ)
         end
       elsif data.bytes.to_a[0] == 6
-        puts "GOT ACK --- GENERATING RESPONSE"
+        #puts "GOT ACK --- GENERATING RESPONSE"
         unless self.headers.blank?
           header_responses = self.headers[-1].build_one_response({machine_name: self.headers[-1].machine_name})
           ## if no queries then, we have to send ack.
           if header_responses.blank?
-            puts "sending ACK since there are no queries in the header"
+            #puts "sending ACK since there are no queries in the header"
             send_data(ACK)
           end
           header_responses.each_with_index {|response,key|
@@ -154,30 +186,30 @@ module LabInterface
             final_resp_arr = final_resp.bytes.to_a
             final_resp_arr << 10
             if (self.headers[-1].response_sent == false)
-              puts "sending the  data as follows----------------------------------------------"
-              puts "response sent is:"
-              puts self.headers[-1].response_sent
-              puts final_resp_arr.pack('c*').gsub(/\r/,'\n')
+              #puts "sending the  data as follows----------------------------------------------"
+              #puts "response sent is:"
+              #puts self.headers[-1].response_sent
+              #puts final_resp_arr.pack('c*').gsub(/\r/,'\n')
               send_data(final_resp_arr.pack('c*')) 
               self.headers[-1].response_sent = true if (key == (header_responses.size - 1))
             else
-              puts "sending EOT"
+              #puts "sending EOT"
               send_data(EOT)
             end
           }
         else
-          puts "NO HEADERS PRESENT --- "
+          #puts "NO HEADERS PRESENT --- "
         end
       elsif data.bytes.to_a[0] == 255
-        puts  " ----------- got 255 data -----------, not sending anything back. "
+        #puts  " ----------- got 255 data -----------, not sending anything back. "
       else
-        unless self.data_buffer.blank?
-          puts self.data_buffer.gsub(/\r/,'\n').to_s
-        end
+        #unless self.data_buffer.blank?
+        #  puts self.data_buffer.gsub(/\r/,'\n').to_s
+        #end
         ## send the header 
         #puts "--------- SENT ACK -----------"
         if self.data_buffer =~ /MSH\|/
-          puts " -------------- HEADERS ARE BLANK WITH HL7, sending ack. ------------ "
+          #puts " -------------- HEADERS ARE BLANK WITH HL7, sending ack. ------------ "
           process_text(self.data_buffer)
           self.data_buffer = ''
           if self.headers.size > 0
@@ -185,7 +217,7 @@ module LabInterface
             send_data(self.headers[-1].generate_ack_success_response)
           end
         else
-          puts " -------------- HEADERS ARE BLANK NOT HL7, sending ack. ------------ "
+          #puts " -------------- HEADERS ARE BLANK NOT HL7, sending ack. ------------ "
           send_data(ACK)
         end
       end
@@ -199,12 +231,14 @@ module LabInterface
   end
 
   def send_enq
-    puts "enq as bytes is:"
-    puts ENQ.unpack('c*')
+    #puts "enq as bytes is:"
+    #puts ENQ.unpack('c*')
     send_data(ENQ)
   end
 
   def process_text(text)
+      puts "text is:"
+      puts text
       text.split("\n").each do |l|
 		    line = Line.new({:text => l})
         process_type(line)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_astm
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Bhargav Raut