oddb2xml 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c23ad09144021304d4c843e68e223d7071fa6f45
-  data.tar.gz: 28469d65080b256c22ddece82312e8a580144dfa
+  metadata.gz: 548c524682d20936d0b0dbc19734159021f14b1f
+  data.tar.gz: 296253b38b02e80c06874f12eae3c8cdc48a3fdc
 SHA512:
-  metadata.gz: 1741fd3f64f4b735062b4e456e4643b673cb5bf9a31ce4fad59737b95ac3102d35c13d804796947fbc2602f8940d2aa3fe5b46dcb6d886cfb349dc3279f5dc4f
-  data.tar.gz: 6e75c9e2f02ef5811e2f6227bf5c82da6111b5d030aaa2bdbaeda1fd36220b4882d128075070670a7493cc444a60e8f2b39d72c285f11de51f7b69c7352898a5
+  metadata.gz: 0199e288fd594f3f084c78b08289ffe7495ac7ec4ce239f79a797faa90f606b5ebc26e6990892cfa147200f87b0a40bc532ce47fb4826c06581f3a193de14024
+  data.tar.gz: 68104c147630445ab5c2a1a493bacab6c1a53c8bfae15f8f3a3903a865026164bfce8f1704812959450869bb522eeb82cc89a89cb3c1c6408ced64babf50e134

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.1.5)
+    oddb2xml (2.1.6)
       archive-tar-minitar (~> 0.5.2)
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)
@@ -65,7 +65,7 @@ GEM
     pry-debugger (0.2.3)
       debugger (~> 1.3)
       pry (>= 0.9.10, < 0.11.0)
-    rack (1.6.0)
+    rack (1.6.1)
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
@@ -125,3 +125,6 @@ DEPENDENCIES
   rdoc
   rspec
   webmock
+
+BUNDLED WITH
+   1.10.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.1.6 / 10.06.2015
+
+* Avoid error when Packungen.xlsx does not contain a name for a product (upstream error, missing Combizym, Dragées)
+
 === 2.1.5 / 03.06.2015
 
 * Give substances for lines starting with Solvens

data/lib/oddb2xml/builder.rb

@@ -680,7 +680,7 @@ module Oddb2xml
                 $stdout.flush
             end
             no8                 = sprintf('%05d',row.cells[0].value.to_i) + sprintf('%03d',row.cells[10].value.to_i)
-            name                = row.cells[2].value
+            name                = row.cells[2]  ? row.cells[2].value  : nil
             atc_code            = row.cells[5]  ? row.cells[5].value  : nil
             list_code           = row.cells[6]  ? row.cells[6].value  : nil
             package_size        = row.cells[11] ? row.cells[11].value : nil
@@ -691,8 +691,12 @@ module Oddb2xml
             # skip veterinary product
             next if atc_code  and /^Q/i.match(atc_code)
             next if list_code and /Tierarzneimittel/.match(list_code)
-
-            info = Calc.new(name, package_size, unit, active_substance, composition)
+            begin
+              info = Calc.new(name, package_size, unit, active_substance, composition)
+            rescue
+              puts "#{Time.now}: #{row_nr} iksnr #{iksnr} rescue from Calc.new"
+              info = nil
+            end
             ean12 = '7680' + no8
             ean13 = (ean12 + Oddb2xml.calc_checksum(ean12))
             items[ean13] = info
@@ -724,7 +728,7 @@ module Oddb2xml
                   }
                 }
               }
-            } if info.compositions
+            } if info and info.compositions
           end
         }
       end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip