ruby_astm 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7633bfcc74d626e2135ceab715f3b91ce9d6a1093a3748829a2e589550c6d9e
-  data.tar.gz: ced94d1d9124f265c519a49e9ce9325924d266abe16f6d63acf80c44990ab6b0
+  metadata.gz: ff47022f17e44e7b468663c714471a1cf0bd91835593bc166f6ca2b61a17ae85
+  data.tar.gz: a5d3ff3c77309b37de9982f1cefa607f6e0d5987084a561fcee8450c5a908294
 SHA512:
-  metadata.gz: '056821d5b0b2c10929205a4d528dfced19bf978d1719ac26cf32fd2212c4cec25666576e25a1fed01761fb3faa871d69b7120b1a994ad022990c5399df9a9ede'
-  data.tar.gz: 8d2fff46ffd8615662c856284301c03a07c0c776096e1f6c0c7c2a29a05c17a821b0d97bfce4e628a0c2e01aabb0bc2cd6bfaa145fbf589ca419118f0c179d3f
+  metadata.gz: 3372e998ddd5efc872128ea7648d8e8c87301f70414d03faece6348571190caf3641b1350d6eac52bdb213cd7a2cbc4b1f53fb50fed17a696a4cbd9b56aeeb6d
+  data.tar.gz: e228f0592560317f905d1d465c8e63790b67d184e4c1303ebb03772ac3d0c95e11002028df86b05c971389c1c32757961c1e9d8dcd7fb143879ba7a7c06af67d

data/lib/ruby_astm/header.rb

@@ -46,10 +46,17 @@ class Header
 	end
 
 	def build_one_response
+		puts "building one response=========="
+		puts "queries are:"
+		puts self.queries.size.to_s
 		responses = []
 		self.queries.each do |query|
+			puts "doing query"
+			puts query.sample_ids
 			header_response = "1H|\`^&||||||||||P|E 1394-97|#{Time.now.strftime("%Y%m%d%H%M%S")}\r"
 			query.build_response.each do |qresponse|
+				puts "qresponse is:"
+				puts qresponse
 				header_response += qresponse
 				#responses << (header_response + qresponse)
 			end

data/lib/ruby_astm/lab_interface.rb

@@ -63,11 +63,11 @@ 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|
         x = [byte].pack('c*').force_encoding('UTF-8')
@@ -96,22 +96,23 @@ module LabInterface
 
       if data.bytes.to_a[-1] == 4
         #puts self.data_buffer
+        puts "GOT EOT --- PROCESSING BUFFER, AND CLEARING."
         process_text(self.data_buffer)
+        puts "queries are:"
+        if !self.headers.blank?
+          puts self.headers[-1].queries
+        end
         self.data_buffer = ''
         send_data(ENQ)
       elsif data.bytes.to_a[0] == 6
+        puts "got ack."
+        puts "building one 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" 
           final_resp_arr = final_resp.bytes.to_a
           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:"
@@ -132,8 +133,12 @@ module LabInterface
           if self.headers[-1].is_astm?
             send_data(ACK)
           elsif self.headers[-1].is_hl7?
+            puts "processing hl7"
+            process_text(self.data_buffer)
+            self.data_buffer = ''
             if self.headers.size > 0
               ## commit should return the jsonified thing, if possible.
+              
               self.headers[-1].commit
               send_data(self.headers[-1].generate_ack_success_response)
             end

data/lib/ruby_astm/line.rb

@@ -41,7 +41,7 @@ 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| 

data/lib/ruby_astm/query.rb

@@ -32,11 +32,14 @@ class Query
 
 		one_response = ''
 
-		self.sample_ids.each_with_index {|sid,key|
+		puts "sample ids are:"
+		puts self.sample_ids
 
+		self.sample_ids.each_with_index {|sid,key|
+			puts "doing sample id: #{sid}"
 			## tests are got from the requisitions hash.
 			tests = get_tests(sid)
-
+			puts "tests are: #{tests}"
 			## default sequence number is 0 (THIS MAY LEAD TO PROBLEMS.)
 			sequence_number = "#{key.to_s}"
 
@@ -51,7 +54,10 @@ class Query
 
 		}
 
-		return [one_response]
+		puts "responses are:"
+		puts responses.to_s
+
+		return responses
 		
 	end
 

metadata

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