ruby_astm 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5aad9b688056b23b5252d954ec6f6e53d11decab2e5adbd33251613642f5ee0
-  data.tar.gz: 1b9b7cac6d3122b4cd62a36611a05226254453a124788078ba51ab0ea03f22fd
+  metadata.gz: f7633bfcc74d626e2135ceab715f3b91ce9d6a1093a3748829a2e589550c6d9e
+  data.tar.gz: ced94d1d9124f265c519a49e9ce9325924d266abe16f6d63acf80c44990ab6b0
 SHA512:
-  metadata.gz: 8ca884192d09d41a0982012a22fd79a832f7737697f1b182ba125e28cfc4a194c4908a62d7e5eae127e4acfa6bdf248a3012d26a5d557fcacdb083625bd1fad2
-  data.tar.gz: 6e1896e259496d069a9aa86e255a38b70c119b4460b3e875958360bbcfc013a86dd88aed79a2a78192c729fad14de321794573bdf4008fe5b0e58a4eaee89fdf
+  metadata.gz: '056821d5b0b2c10929205a4d528dfced19bf978d1719ac26cf32fd2212c4cec25666576e25a1fed01761fb3faa871d69b7120b1a994ad022990c5399df9a9ede'
+  data.tar.gz: 8d2fff46ffd8615662c856284301c03a07c0c776096e1f6c0c7c2a29a05c17a821b0d97bfce4e628a0c2e01aabb0bc2cd6bfaa145fbf589ca419118f0c179d3f

data/lib/ruby_astm/header.rb

@@ -45,14 +45,40 @@ class Header
 		puts JSON.pretty_generate(JSON.parse(self.to_json))
 	end
 
+	def build_one_response
+		responses = []
+		self.queries.each do |query|
+			header_response = "1H|\`^&||||||||||P|E 1394-97|#{Time.now.strftime("%Y%m%d%H%M%S")}\r"
+			query.build_response.each do |qresponse|
+				header_response += qresponse
+				#responses << (header_response + qresponse)
+			end
+			responses << header_response
+		end
+		responses
+	end
+
 	## used to respond to queries.
 	## @return[String] response_to_query : response to the header query.
 	def build_responses
+		responses = []
+		self.queries.each do |query|
+			header_response = "1H|\`^&||||||||||P|E 1394-97|#{Time.now.strftime("%Y%m%d%H%M%S")}\r"
+			query.build_response.each do |qresponse|
+				responses << (header_response + qresponse)
+			end
+		end
+=begin
 		responses = self.queries.map {|query|
 			header_response = "1H|\`^&||||||||||P|E 1394-97|#{Time.now.strftime("%Y%m%d%H%M%S")}\r"
+			## here the queries have multiple responses.
+			query.build_response.each do |qresponse|
+
+			end
 			query.response = header_response + query.build_response
 			query.response
 		}
+=end
 		responses
 	end
 

data/lib/ruby_astm/lab_interface.rb

@@ -63,7 +63,7 @@ module LabInterface
       
       self.data_buffer ||= ''
 
-      #puts "incoming data bytes."
+      puts "incoming data bytes."
 
       concat = ""
       
@@ -95,12 +95,17 @@ module LabInterface
       
 
       if data.bytes.to_a[-1] == 4
-        puts self.data_buffer
+        #puts self.data_buffer
         process_text(self.data_buffer)
         self.data_buffer = ''
         send_data(ENQ)
       elsif data.bytes.to_a[0] == 6
-        self.headers[-1].build_responses.each do |response|
+        header_responses = self.headers[-1].build_one_response
+        header_responses.each_with_index {|response,key|
+          #puts "response is:"
+          #response.bytes.to_a.each do |b|
+          #  puts [b].pack('c*')
+          #end
           message_checksum = checksum(response + terminator + ETX)
           #puts "Calculated checksum is: #{message_checksum}"
           final_resp = STX + response + terminator + ETX + message_checksum + "\r" 
@@ -108,12 +113,16 @@ module LabInterface
           final_resp_arr << 10
           #puts final_resp_arr.to_s
           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')
             send_data(final_resp_arr.pack('c*')) 
-            self.headers[-1].response_sent = true
+            self.headers[-1].response_sent = true if (key == (header_responses.size - 1))
           else
             send_data(EOT)
           end
-        end
+        }
       else
         ## send the header 
         #puts "--------- SENT ACK -----------"

data/lib/ruby_astm/line.rb

@@ -41,8 +41,9 @@ class Line
 	end 
 
 	def detect_type
-		#puts "detecting line type: #{self.text}"
+		puts "detecting line type: #{self.text}"
 		line_type = self.fields[0]
+		return unless line_type
 		line_type.scan(/(?<ltype>[A-Z]+)/) { |ltype| 
 			if Line::TYPES[ltype[0]]
 				self.type = Line::TYPES[ltype[0]]

data/lib/ruby_astm/order.rb

@@ -117,7 +117,7 @@ class Order
 			#puts "no specimen type has been provided, sending SERUM"
 		end
 
-		"O|#{self.sequence_number}|#{self.id}^01||^^^#{self.tests.join('`^^^')}|#{self.priority}||#{Time.now.strftime("%Y%m%d%H%M%S")}||||N||||#{self.specimen_type || 'SERUM'}\r"
+		"O|#{self.sequence_number}|#{self.id}|#{Time.now.to_i.to_s}|^^^#{self.tests.join('`^^^')}|#{self.priority}||#{Time.now.strftime("%Y%m%d%H%M%S")}||||N||||#{self.specimen_type || 'SERUM'}\r"
 	end	
 
 end

data/lib/ruby_astm/query.rb

@@ -4,17 +4,20 @@ class Query
 
 	attr_accessor :response
 
+	attr_accessor :sample_ids
+
 	def initialize(args)
 		line = args[:line]
 		unless line.fields[2].empty?
 			fields = line.fields[2].split(/\^/)
-			self.sample_id = fields[1].strip
+			sample_id = fields[1].strip
+			self.sample_ids = sample_id.split(/\`/)
 		end
 	end
 
-	def get_tests
+	def get_tests(sample_id)
 		tests = []
-		sample_tests = $redis.hget(Poller::REQUISITIONS_HASH,self.sample_id)
+		sample_tests = $redis.hget(Poller::REQUISITIONS_HASH,sample_id)
 		unless sample_tests.blank?
 			tests = JSON.parse(sample_tests)
 		end
@@ -24,31 +27,31 @@ class Query
 	## each query will build one patient and one order inside it.
 	## the order can have many tests.
 	def build_response(variables=nil)
-		## so the response is thus incoming.
-=begin		
-		variables ||= {
-			:sequence_number => "0",
-			:patient_id => "abcde",
-			:specimen_id => self.sample_id,
-			:tests => ["TRIG"],
-			:priority => "R"
-		}	
-=end
-
-		## tests are got from the requisitions hash.
-		tests = get_tests
-
-		## default sequence number is 0 (THIS MAY LEAD TO PROBLEMS.)
-		sequence_number = "0"
-
-		## default patient id:
-		patient_id = "abcde#{Time.now.strftime('%b %d, %Y, %H:%M:%S')}"
-
-		patient = Patient.new({:sequence_number => sequence_number, :patient_id => patient_id})
 		
-		order = Order.new({:sequence_number => patient.sequence_number, :specimen_id => self.sample_id, :tests => tests, :priority => "R"})
+		responses = []
+
+		one_response = ''
+
+		self.sample_ids.each_with_index {|sid,key|
+
+			## tests are got from the requisitions hash.
+			tests = get_tests(sid)
+
+			## default sequence number is 0 (THIS MAY LEAD TO PROBLEMS.)
+			sequence_number = "#{key.to_s}"
+
+			## default patient id:
+			patient_id = "abcde#{Time.now.to_i.to_s}"
+			
+			patient = Patient.new({:sequence_number => sequence_number, :patient_id => patient_id})
+			
+			order = Order.new({:sequence_number => patient.sequence_number, :specimen_id => sid, :tests => tests, :priority => "R"})
+
+			responses << (patient.build_response + order.build_response)
+
+		}
 
-		return patient.build_response + order.build_response
+		return [one_response]
 		
 	end
 

metadata

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