oddb2xml 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8de23f42038eb80cc0f1b7468b9e5fa6e40274a1
-  data.tar.gz: '0383eb0e96e8fa789dbf89e3f74129ce9fa95624'
+SHA256:
+  metadata.gz: cc3e56a43eff7b85027dc12b927d57a8aebe943c6964108cb28cb430a1cfe2df
+  data.tar.gz: e9af1d5b625086d3ae824fd1dfc57b6ecb6da44a6e3b971a5fe3a4be5ccf6276
 SHA512:
-  metadata.gz: 97430a7ecb08aaa1095277cc59c5372fa55be940f73f6aa82eee0346a0a06067090ff067d03d4b4d3c1eb006f708d1efcb7dc9808af0ee84e32c2011b1b273c0
-  data.tar.gz: 3aa0b0ab8425522ee4f0f712895b18fc9c72ac3a859ee4a771cec5d268c49bb2fbf9455dbd3c1879d470c9eca03c28cba24e3a5f5f8dd2cbf460ae31c19bcf37
+  metadata.gz: bc2108a78bd1fef35651632cc57a9ddc245ae1859c41845004a575e291cdda718fb98d15e32055c1223d15055ab4952801452f558a56c1a6079989d9e012276b
+  data.tar.gz: 0eb25db55df9755a8f9762ec44bedbb1b63ec6d3619d5abc01d1360f7b1ef6203b1eaa752fc23b52bbcaea58091bff6e2c51245949bfa7c381e0f2e057216d97

data/History.txt

@@ -1,3 +1,6 @@
+=== 2.6.4 / 14.08.2019
+* Fix issue #35: Missing product with ATC code for 7680005850010 Varilrix when building Artikelstamm_V5
+
 === 2.6.3 / 01.07.2019
 * Use https://github.com/zdavatz/cpp2sqlite/blob/master/input/atc_codes_multi_lingual.txt instead of http://download.epha.ch/data/atc/atc.csv
 

data/lib/oddb2xml/builder.rb

@@ -859,7 +859,7 @@ module Oddb2xml
         @articles.sort! { |a,b| a[:ean13] <=> b[:ean13] }
         @articles.each do |obj|
           idx += 1
-          Oddb2xml.log "build_article #{idx} of #{@articles.size} articles" if idx % 500 == 0
+          Oddb2xml.log "build_article #{obj[:ean13]}: #{idx} of #{@articles.size} articles" if idx % 500 == 0
             item = @items[obj[:ean13]]
             pac,no8 = nil,obj[:ean13].to_s[4..11] # BAG-XML(SL/LS)
             pack_info = nil
@@ -1449,7 +1449,7 @@ module Oddb2xml
             obj = @packs[no8] # obj not yet in refdata. Use data from swissmedic_package.xlsx
           end
           nr_items += 1
-          Oddb2xml.log "build_article #{nr_items} of #{gtins.size} articles" if nr_items % 5000 == 0
+          Oddb2xml.log "build_artikelstamm #{ean13}: #{nr_items} of #{gtins.size} articles" if nr_items % 5000 == 0
           item = @items[ean13]
           pack_info = nil
           pack_info = @packs[no8] if no8 && /#{ean13}/.match(@packs[no8].to_s) # info from Packungen.xlsx from swissmedic_info
@@ -1509,7 +1509,7 @@ module Oddb2xml
                 name_fr ||= (obj[:name_fr] + ', ' + obj[:desc_fr]).strip if  obj[:name_fr]
                 # ZuRorse has only german names
                 name_fr ||= (item[:name_fr] + ', ' + item[:desc_fr]) if item
-                name_fr ||= '--missing--'
+                name_fr ||= name
                 xml.DSCRF(name_fr)
                 xml.COMP  do # Manufacturer
                   xml.NAME  obj[:company_name]
@@ -1558,11 +1558,13 @@ module Oddb2xml
                 end if item && item[:deductible]
                 prodno = Oddb2xml.getProdnoForEan13(pkg_gtin)
                 xml.PRODNO prodno if prodno
+                atc = package[:atc_code]
+                atc ||= @refdata[pkg_gtin][:seq][:atc_code] if @refdata[pkg_gtin]
                 csv = []
                 @csv_file << [pkg_gtin, name, package[:unit], measure,
                               pexf ? pexf : '',
                               ppub ? ppub : '',
-                              package[:prodno],  package[:atc_code], package[:substance_swissmedic],
+                              prodno,  atc, package[:substance_swissmedic],
                               sequence[:org_gen_code],  package[:ith_swissmedic],
                               @items[pkg_gtin] ? 'SL' : '',
                               ]
@@ -1658,18 +1660,20 @@ module Oddb2xml
               sequence ||= @products[ean][:seq] if @products[ean]
               next unless check_name(obj, :de)
               ppac = ((_ppac = @packs[ean.to_s[4..11]] and !_ppac[:is_tier]) ? _ppac : {})
-              unless ppac
-                ppac = @packs.find{|pac| pac.ean == ean }.first
-              end
               prodno = ppac[:prodno] if ppac[:prodno] and !ppac[:prodno].empty?
               prodno = obj[:pharmacode] if obj[:chapter70]
+              myPack = @packs.values.find{ |x| x[:iksnr].to_i == obj[:seq][:swissmedic_number5].to_i } if  obj[:seq]
+              if myPack && !prodno
+                prodno ||= myPack[:prodno]
+                puts "Setting prodno #{prodno} for #{ean13} Varilrix"
+              end
               next unless prodno
               next if emitted_prodno.index(prodno)
               sequence ||= @articles.find{|x| x[:ean13].eql?(ean)}
               unless obj[:chapter70]
                 next unless sequence && (sequence[:name_de] || sequence[:desc_de])
-                if Oddb2xml.getEan13forProdno(prodno).size == 0
-                  puts "No item found for prodno #{prodno} no8 #{obj[:no8]} #{sequence[:name_de]} "
+                if Oddb2xml.getEan13forProdno(prodno).size == 0 && !obj[:no8].eql?(Oddb2xml.getNo8ForEan13(ean))
+                  puts "No item found for prodno #{prodno} no8 #{obj[:no8]} #{sequence[:name_de]}"
                   next
                 end
               end

data/lib/oddb2xml/extractor.rb

@@ -319,6 +319,7 @@ module Oddb2xml
             Oddb2xml.setEan13forProdno(prodno, ean13)
             Oddb2xml.setEan13forNo8(no8, ean13)
             data[no8] = {
+              :iksnr                => row[iksnr].value.to_i,
               :no8                  => no8,
               :ean13                => ean13,
               :prodno               => prodno,

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.6.3"
+  VERSION = "2.6.4"
 end

data/spec/artikelstamm_spec.rb

@@ -121,7 +121,7 @@ describe Oddb2xml::Builder do
     it 'should find price from Preparations.xml by setting' do
       expect(File.exists?(@elexis_v5_csv)).to eq true
       inhalt = File.open(@elexis_v5_csv, 'r+').read
-      expected = %(7680658560014,Dibase 10'000 Tropfen 10000 IE/ml Fl 10 ml,,Flasche(n),5,9.25,,,,"",,SL)
+      expected = %(7680658560014,Dibase 10'000 Tropfen 10000 IE/ml Fl 10 ml,,Flasche(n),5,9.25,6585601,A11CC05,,"",,SL)
       expect(inhalt.index(expected)).to be > 0
     end
 
@@ -139,7 +139,7 @@ describe Oddb2xml::Builder do
     it 'should have a price for Lynparza' do
       expect(File.exists?(@elexis_v5_csv)).to eq true
       inhalt = File.open(@elexis_v5_csv, 'r+').read
-      expect(inhalt.index('7680651600014,Lynparza Kaps 50 mg 448 Stk,,Kapsel(n),5562.48,5947.55,,,,"",,SL')).not_to be nil
+      expect(inhalt.index('7680651600014,Lynparza Kaps 50 mg 448 Stk,,Kapsel(n),5562.48,5947.55,6516001,L01XX46,,"",,S')).not_to be nil
     end
     it 'should trim the ean13 to 13 length' do
       gtin14 = "00040565124346"
@@ -214,23 +214,27 @@ describe Oddb2xml::Builder do
     
     it 'should contain DIBASE with phar' do
       expected = %(<ITEM PHARMATYPE="P">
-            <GTIN>7680658570013</GTIN>
-            <!--override  with-->
+            <GTIN>7680658560014</GTIN>
+            <!--obsolete override-->
+            <PHAR>7199565</PHAR>
             <SALECD>A</SALECD>
-            <DSCR>DIBASE 25'000, Lösung zum Einnehmen</DSCR>
-            <DSCRF>--missing--</DSCRF>
+            <DSCR>Dibase 10'000 Tropfen 10000 IE/ml Fl 10 ml</DSCR>
+            <DSCRF>Dibase 10'000 gouttes 10000 UI/ml fl 10 ml</DSCRF>
             <COMP>
                 <NAME>Gebro Pharma AG</NAME>
-                <GLN/>
+                <GLN>7612053000000</GLN>
             </COMP>
+            <PEXF>5</PEXF>
+            <PPUB>9.25</PPUB>
             <PKG_SIZE>1</PKG_SIZE>
             <MEASURE>Flasche(n)</MEASURE>
             <MEASUREF>Flasche(n)</MEASUREF>
-            <DOSAGE_FORM>Lösung</DOSAGE_FORM>
-            <DOSAGE_FORMF>Solution</DOSAGE_FORMF>
+            <DOSAGE_FORM>orale Tropflösung</DOSAGE_FORM>
+            <SL_ENTRY>true</SL_ENTRY>
             <IKSCAT>D</IKSCAT>
-            <PRODNO>6585701</PRODNO>
-        </ITEM>)
+            <DEDUCTIBLE>10</DEDUCTIBLE>
+            <PRODNO>6585601</PRODNO>
+        </ITEM)
       expect(@inhalt.index(expected)).not_to be nil
     end
     
@@ -329,7 +333,7 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>10</DEDUCTIBLE>
             <PRODNO>1610501</PRODNO>
         </ITEM>),
-        'item 7680161050743 100g ' => 
+        'item 7680161050743 Hirudoid Creme 3 mg/g 100 g' =>
               %( <ITEM PHARMATYPE="P">
             <GTIN>7680161050743</GTIN>
             <PHAR>2731179</PHAR>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -487,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.