oddb2xml 1.5.1 → 1.5.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.5.2 / 12.06.2013
+
+* Improve NINCD detection
+  - Update timeout handling
+  - Improve pharmacode detection                
+
 === 1.5.1 / 10.06.2013
 
 * Update oddb2xml to handle pharmacode that is started with "0"

data/lib/oddb2xml/builder.rb

@@ -667,18 +667,7 @@ module Oddb2xml
                 #xml.ARTLIM {
                 #  xml.LIMCD
                 #}
-                seq = @items[de_idx[:pharmacode]]
-                nincd = if @lppvs[de_idx[:ean]] # LPPV
-                  20
-                elsif seq # BAG-XML (SL/LS)
-                  10
-                elsif (de_idx[:migel] or # MiGel (xls)
-                       de_idx[:_type] == :nonpharma) # MiGel (swissindex)
-                  13
-                else
-                  nil
-                end
-                if nincd
+                if nincd = detect_nincd(de_idx)
                   xml.ARTINS {
                     #xml.VDAT
                     #xml.INCD
@@ -855,6 +844,26 @@ module Oddb2xml
       end
       _builder.to_xml
     end
+    def detect_nincd(de_idx)
+      if @lppvs[de_idx[:ean]] # LPPV
+        20
+      elsif @items[de_idx[:pharmacode]] # BAG-XML (SL/LS)
+        10
+      elsif (de_idx[:migel] or # MiGel (xls)
+             de_idx[:_type] == :nonpharma) # MiGel (swissindex)
+        13
+      else
+        # fallback via EAN
+        bag_entry_via_ean = @items.values.select do |i|
+          i[:packages].values.select {|_pac| _pac[:ean] == de_idx[:ean] }.length != 0
+        end.length
+        if bag_entry_via_ean > 0
+          10
+        else
+          nil
+        end
+      end
+    end
 
     ### --- see oddb2tdat
     DAT_LEN = {

data/lib/oddb2xml/downloader.rb

@@ -14,7 +14,7 @@ module Oddb2xml
         response = nil # win
         io = File.open(file, option)
         return io.read
-      rescue Timeout::Error
+      rescue Timeout::Error, Errno::ETIMEDOUT
         retrievable? ? retry : raise
       ensure
         io.close if io and !io.closed? # win
@@ -144,7 +144,7 @@ module Oddb2xml
           response = nil # win
         end
         return read_xml_form_zip(/^Preparation/iu, file)
-      rescue Timeout::Error
+      rescue Timeout::Error, Errno::ETIMEDOUT
         retrievable? ? retry : raise
       ensure
         if File.exists?(file)
@@ -197,7 +197,7 @@ XML
         end
       rescue HTTPI::SSLError
         exit # catch me in Cli class
-      rescue Timeout::Error
+      rescue Timeout::Error, Errno::ETIMEDOUT
         retrievable? ? retry : raise
       end
     end
@@ -231,7 +231,7 @@ XML
         end
         io = File.open(file, 'rb')
         return io.read
-      rescue Timeout::Error
+      rescue Timeout::Error, Errno::ETIMEDOUT
         retrievable? ? retry : raise
       ensure
         io.close if io and !io.closed?
@@ -265,7 +265,7 @@ XML
           response = nil # win
         end
         return read_xml_form_zip(/^AipsDownload_/iu, file)
-      rescue Timeout::Error
+      rescue Timeout::Error, Errno::ETIMEDOUT
         retrievable? ? retry : raise
       rescue NoMethodError
         # pass

data/lib/oddb2xml/extractor.rb

@@ -24,6 +24,13 @@ module Oddb2xml
     def initialize(xml)
       @xml = xml
     end
+    def correct_code(pharmacode, length=7)
+      if pharmacode.length != length # restore zero at the beginnig
+        ("%0#{length}i" % pharmacode.to_i)
+      else
+        pharmacode
+      end
+    end
   end
   class BMUpdateExtractor < Extractor
     include TxtExtractorMethods
@@ -68,12 +75,13 @@ module Oddb2xml
         item[:packages]    = {} # pharmacode => package
         seq.xpath('.//Pack').each do |pac|
           if phar = pac.attr('Pharmacode')
-            phar = phar.to_s
+            phar = correct_code(phar.to_s, 7)
             # as common key with swissINDEX
             item[:pharmacodes] << phar
             # packages
             item[:packages][phar] = {
               :pharmacode          => phar,
+              :ean                 => (ean = pac.at_xpath('.//GTIN')) ? ean.text : '',
               :swissmedic_category => (cat = pac.at_xpath('.//SwissmedicCategory')) ? cat.text : '',
               :swissmedic_number8  => (num = pac.at_xpath('.//SwissmedicNo8'))      ? num.text.rjust(8, '0') : '',
               :narcosis_flag       => (flg = pac.at_xpath('.//FlagNarcosis'))       ? flg.text : '',
@@ -176,9 +184,7 @@ module Oddb2xml
           item[:company_ean]  = (gln = comp.at_xpath('.//GLN'))  ? gln.text : ''
         end
         unless item[:pharmacode].empty?
-          if item[:pharmacode].length != 7 # restore zero at the beginnig
-            item[:pharmacode] = ("%07i" % item[:pharmacode])
-          end
+          item[:pharmacode] = correct_code(item[:pharmacode].to_s, 7)
           unless data[item[:pharmacode]] # pharmacode => GTINs
             data[item[:pharmacode]] = []
           end
@@ -286,7 +292,7 @@ module Oddb2xml
       data = {}
       @sheet.each_with_index do |row, i|
         next if i.zero?
-        phar = row[1].to_s
+        phar = correct_code(row[1].to_s.gsub(/[^0-9]/, ''), 7)
         data[phar] = {
           :ean             => row[0].to_i.to_s,
           :pharmacode      => phar,

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip