ruby_astm 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc05e6b6b235e7df2ca1c58a743122e801c8c18b
-  data.tar.gz: 2abc30cf1f6a90e3942bdd03a7b2dc1b9f7c846b
+  metadata.gz: 45a5db6505182ace88ffe6adb2c1b9595b432613
+  data.tar.gz: d111d2c14ba61ca507fc4f743e94d0578f4555f5
 SHA512:
-  metadata.gz: 470f3f0bffa8cba632548f65a2f782a177e38bc4989880fd112a908ce98337dd940097e0f70ad0f6b79ce0d4711e5ab8f10dde25151e9a047f2dc101dfd2c325
-  data.tar.gz: e3fec45152ad2716ec63efcfdcb1c7211c6db528a0cf1d0f3301d03484f0cf7f09766afe9f63f26aca8cb267ea4d6015cb3aee1d63678355bb6b71e4a8b954d3
+  metadata.gz: dfa51b7827945a702895e4c061697fc6b25862b918f2f4fdc098fc8e1a1513930eece5d39ff2c9a79d8c00a7bbc1ab3f28aa2f3df676d8fb071489ba3b3c0a36
+  data.tar.gz: b64b9600d4ed08846ff172fbe433b24886e2040f3802be08b961b06492d9512c2b29d47802a108ed4a7d1d2b066ebe317b3ba3cfc9120e9784c7bf0850dba8f1

data/lib/publisher/google_lab_interface.rb

@@ -101,6 +101,7 @@ class Google_Lab_Interface < Poller
   # method overriden from adapter.
   # data should be an array of objects.
   # see adapter for the recommended structure.
+  # @return[Boolean] true/false : depending on if there was an error or not.
   def update(data)
 
     orders = JSON.generate(data)
@@ -121,13 +122,15 @@ class Google_Lab_Interface < Poller
       if resp.error
         AstmServer.log("Error updating results to LIS, message follows")
         AstmServer.log("error: #{resp.error.message} : code: #{resp.error.code}")
-        #puts "there was an error."
+        false
       else
         AstmServer.log("Updating results to LIS successfull")
+        true
       end
     rescue => e
       AstmServer.log("Error updating results to LIS, backtrace follows")
       AstmServer.log(e.backtrace.to_s)
+      false
     end
 
   end

data/lib/publisher/poller.rb

@@ -230,8 +230,9 @@ class Poller
   	end
 
   	## override to define how the data is updated.
+  	## expected to return Boolean value, depending on whether the update was successfull or not.
   	def update(data)
-
+  		true
   	end
 
 	##@param[Array] data : array of objects.
@@ -333,8 +334,11 @@ class Poller
 		while patients_to_process == true
 			if patient_results = $redis.rpoplpush("patients","processing")
 				patient_results = JSON.parse(patient_results)
-				update(patient_results)
+				## do this before the update, so that we don't go into an endless loop if the current update fails.
 				patients_to_process = $redis.llen("patients") > 0
+				unless update(patient_results)
+					$redis.lpush("patients",JSON.generate(patient_results))
+				end
 			else
 				patients_to_process = false
 			end

data/lib/ruby_astm/lab_interface.rb

@@ -37,10 +37,13 @@ module LabInterface
     "L|1|N\r"
   end
 
+
   def checksum(input)
     strString = input
     checksum = strString.sum
+    #puts "checksum before to_s is: #{checksum}"
     b = checksum.to_s(16)
+    #puts "b is: #{b}"
     strCksm = b[-2..-1]
     if strCksm.length < 2 
       for i in strString.length..1

data/lib/ruby_astm/result.rb

@@ -11,7 +11,7 @@ class Result
 	def initialize(args)
 		if args[:line]
 			line = args[:line]
-			line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#-]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
+			line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
 				self.name = lookup_mapping(name)
 				self.dilution = dilution
 			}

metadata

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