oddb2xml 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a338462cc07d2820cb85ed2bab9e76e527a7b2e
-  data.tar.gz: 8b675f13da43ab8967e5d6b389553029433899bf
+  metadata.gz: ecd8f5025daaf98e1a23e42069c1a0b6f0f71792
+  data.tar.gz: 4f7e3d9fa12579d85c93fa00399584e0185fa1ee
 SHA512:
-  metadata.gz: 45c766b45fe01b2b441aaab304347336f3962d2b83224dd43a5462da2b11c1f3cbeb598aba0c0c79e5fbba2ce6b9d951304a572adf1a2dfe29426c99b6b7858e
-  data.tar.gz: feb8c5046c1585e289a17a02f56d9dcebace6ddd8fb0df2c7d0027b1e4fcaabd838c555b799c2e549e2113d47acdf03cfb8cb6255a1651685987af506fb33595
+  metadata.gz: c81408b0c1e8afc663825b5fed409f929225ccd529f8d626c17f58b5ad625ed4b382963b74dbaedd427bf6f13b5d454ef421b442e973b73c42f5521b378eb5a4
+  data.tar.gz: d437a60586bc3e47307da01d9aded873f5968bcb411b848b734a951cd029f77b73bba0efefc8e41f25cdecb6550c2ba108045e14336c57b246b97ab3c79555ea

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.5.4 / 09.04.2018
+
+* Correct name in Artikelstamm, when several packages exist in Preparions.xml (SL)
+* Mark correctly all SL-Entries in Artikeltstamm
+
 === 2.5.3 / 28.03.2018
 
 * Updated needed Ruby version in README.md

data/artikelstamm.md

@@ -40,7 +40,7 @@ Oder
 * swissmedic_package.csv  https://www.swissmedic.ch/dam/swissmedic/de/dokumente/listen/excel-version_zugelasseneverpackungen.xlsx.download.xlsx/excel-version_zugelasseneverpackungen.xlsx
 * oddb2xml_files_lppv.txt https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/LPPV.txt
 * XMLPublications.zip     http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip   Dieses enthält
-** Preparations.xml
+** Preparations.xml       Hier sind alle Artikel aufgeführt, welche zur Spezialitätenliste (aka SL_ENTRY) gehören
 * transfer.zip            http://pillbox.oddb.org/TRANSFER.ZIP Dieses enthält
 ** transfer.dat
 

data/lib/oddb2xml/builder.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
-
 require 'nokogiri'
 require 'oddb2xml/util'
 require 'oddb2xml/calc'
 require 'csv'
-
 class Numeric
   # round a given number to the nearest step
   def round_by(increment)
@@ -51,7 +49,7 @@ module Oddb2xml
       @options    = args
       @subject    = nil
       @refdata    = {}
-      @items      = {} # Items from Preparations.xml in BAG, using @gtins as key
+      @items      = {} # Spezailitäteniste: SL-Items from Preparations.xml in BAG, using GTINS as key
       @flags      = {}
       @lppvs      = {}
       @infos      = {}
@@ -1399,47 +1397,57 @@ module Oddb2xml
       end
       def emit_items(xml)
         nr_items = 0
-        @nr_items = @gtins.size
-        @gtins.each do |ean13|
+        gtins_to_article = {}
+        @articles.each {|article| gtins_to_article[article[:ean13]] = article }
+        sl_gtins = @items.values.collect{|x| x[:packages].keys}.flatten.uniq;
+        gtins = gtins_to_article.keys + @infos_zur_rose.keys + @packs.values.collect{|x| x[:ean13]} + sl_gtins
+        gtins = (gtins-@@gtin2ignore)
+        gtins.sort!.uniq!
+        gtins.each do |ean13|
           pac,no8 = nil,ean13.to_s[4..11] # BAG-XML(SL/LS)
           next if ean13 == 0
-          obj = @gtins_to_article[ean13] || @infos_zur_rose[ean13]
+          obj = gtins_to_article[ean13] || @items.values.find{|x| x[:packages].keys.index(ean13) } || @infos_zur_rose[ean13]
           if obj
             obj = @packs[no8].merge(obj) if @packs[no8]
           else
             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_article #{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
           next if pack_info && /Tierarzneimittel/.match(pack_info[:list_code])
           next if obj[:desc_de] && /ad us vet/i.match(obj[:desc_de])
           sequence    = obj[:seq]
-          unless sequence
-            if  @packs[no8] && /#{ean13}/.match(@packs[no8].to_s)
-              sequence = {:packages =>{ean13 => @packs[no8]}}
-              obj[:seq] = sequence.clone
-            end
+          if sequence.nil? && @packs[no8] && /#{ean13}/.match(@packs[no8].to_s)
+            sequence = {:packages =>{ean13 => @packs[no8]}}
+            obj[:seq] = sequence.clone
           end
-          if no8
-            ppac = ((_ppac = pack_info and !_ppac[:is_tier]) ? _ppac : nil)
+          if sequence.nil? && @items[ean13] && @items[ean13][:packages][ean13]
+            sequence =  @items[ean13]
           end
           if sequence
-            unless obj[:seq][:packages].keys.index(ean13)
+            if obj[:seq] && !obj[:seq][:packages].keys.index(ean13)
               # puts "unable to find  #{ean13} in #{obj[:seq][:packages].keys}"
               next
             end
             sequence[:packages].each do |gtin, package|
               pkg_gtin = package[:ean13].clone
+              if package[:no8] && (newEan13 = Oddb2xml.getEan13forNo8(package[:no8]))
+                if !newEan13.eql?(pkg_gtin)
+                  puts "Setting #{newEan13} for #{pkg_gtin}"
+                  pkg_gtin = newEan13
+                end
+              end
               pharma_code = @refdata[pkg_gtin]
               if @refdata[pkg_gtin] && @refdata[pkg_gtin][:pharmacode]
                 pharma_code = @refdata[pkg_gtin][:pharmacode]
-              else
+              elsif obj[:pharmacode]
                 pharma_code = obj[:pharmacode]
+              elsif @infos_zur_rose[ean13]
+                 pharma_code = @infos_zur_rose[ean13][:pharmacode]
               end
-# 
               info = @calc_items[pkg_gtin]
               if @@emitted_v5_gtins.index(pkg_gtin)
                 next
@@ -1448,17 +1456,30 @@ module Oddb2xml
               end
               options = {'PHARMATYPE' => 'P'}
               xml.ITEM(options) do
-                name = (@refdata[pkg_gtin] ? @refdata[pkg_gtin][:desc_de] : nil) || obj[:desc_de] || obj[:sequence_name]
+                # require 'pry'; binding.pry if pkg_gtin.to_i == 7680665990026
+                name =  item[:name_de] + ' ' +  item[:desc_de].strip + ' ' + package[:desc_de] if package && package[:desc_de]
+                name ||= @refdata[pkg_gtin] ? @refdata[pkg_gtin][:desc_de] : nil
+                name ||= @infos_zur_rose[ean13][:description] if @infos_zur_rose[ean13]
+                name ||= obj[:name_de] + ', ' + obj[:desc_de].strip if  obj[:name_de]
+                name ||= (item[:desc_de] + item[:name_de]) if item
+                name ||= obj[:sequence_name]
                 xml.GTIN pkg_gtin.to_s.rjust(13, '0')
                 override(xml, pkg_gtin, :PHAR, pharma_code)
                 xml.SALECD('A')
                 # maxLength for DSCR is 50 for Artikelstamm v3
                 xml.DSCR(name) # for description for zur_rose
-                xml.DSCRF(obj[:desc_fr] || '--missing--')
+                name_fr =  item[:name_fr] + ' ' +  item[:desc_fr].strip + ' ' + package[:desc_fr] if package && package[:desc_fr]
+                name_fr ||= @refdata[pkg_gtin] ? @refdata[pkg_gtin][:desc_fr] : nil
+                # Zugelassenen Packungen has only german names
+                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--'
+                xml.DSCRF(name_fr)
                 xml.COMP  do # Manufacturer
                   xml.NAME  obj[:company_name]
                   xml.GLN   obj[:company_ean]
-                end
+                end if obj[:company_name] || obj[:company_ean]
                 pexf = ppub = nil
                 if package[:prices]
                   pexf ||= package[:prices][:exf_price][:price]
@@ -1492,16 +1513,15 @@ module Oddb2xml
                   xml.DOSAGE_FORM  info.galenic_form.descriptions['de'] if info.galenic_form.descriptions['de']
                   xml.DOSAGE_FORMF info.galenic_form.descriptions['fr'] if info.galenic_form.descriptions['fr']
                 end
-                xml.SL_ENTRY          'true' if  @items[pkg_gtin]
+                xml.SL_ENTRY          'true' if sl_gtins.index(pkg_gtin)
                 xml.IKSCAT            package[:swissmedic_category] if package[:swissmedic_category] && package[:swissmedic_category].length > 0
                 xml.GENERIC_TYPE sequence[:org_gen_code] if sequence[:org_gen_code] && !sequence[:org_gen_code].empty?
                 xml.LPPV              'true' if @lppvs[pkg_gtin.to_s] # detect_nincd
                 case item[:deductible]
-                when 'Y'; xml.DEDUCTIBLE 20; # 20%
-                when 'N'; xml.DEDUCTIBLE 10; # 10%
-                else #     xml.DEDUCTIBLE '' # k.A.
+                  when 'Y'; xml.DEDUCTIBLE 20; # 20%
+                  when 'N'; xml.DEDUCTIBLE 10; # 10%
                 end if item && item[:deductible]
-                prodno = SwissmedicExtractor.getProdnoForEan13(pkg_gtin)
+                prodno = Oddb2xml.getProdnoForEan13(pkg_gtin)
                 xml.PRODNO prodno if prodno
                 csv = []
                 @csv_file << [pkg_gtin, name, package[:unit], measure,
@@ -1562,7 +1582,7 @@ module Oddb2xml
       @nr_articles = 0
       used_limitations = []
       Oddb2xml.log "#{variant}: Deleted #{@old_rose_size - @new_rose_size} entries from ZurRose where GTIN start with 7680 (Swissmedic)"
-      # Oddb2xml.log "#{variant} #{nr_products} of #{@products.size} articles and ignore #{@@gtin2ignore.size} @gtins specified via #{@@ignore_file}"
+      # Oddb2xml.log "#{variant} #{nr_products} of #{@products.size} articles and ignore #{@@gtin2ignore.size} gtins specified via #{@@ignore_file}"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -1578,11 +1598,6 @@ module Oddb2xml
         no8_to_prodno = {}
         @packs.collect{ |key, val| no8_to_prodno[key] = val [:prodno] }
         xml.comment("Produced by #{__FILE__} version #{VERSION} at #{Time.now}")
-        @gtins_to_article = {}
-        @articles.each {|article| @gtins_to_article[article[:ean13]] = article }
-        @gtins = @gtins_to_article.keys + @infos_zur_rose.keys + @packs.values.collect{|x| x[:ean13]}
-        @gtins = (@gtins-@@gtin2ignore)
-        @gtins.sort!.uniq!
         xml.ARTIKELSTAMM(options_xml) do
           xml.PRODUCTS do
             products = @products.sort_by { |ean13, obj| ean13 }
@@ -1603,7 +1618,7 @@ module Oddb2xml
               next if emitted_prodno.index(prodno)
               sequence ||= @articles.find{|x| x[:ean13].eql?(ean)}
               next unless sequence && (sequence[:name_de] || sequence[:desc_de])
-              if SwissmedicExtractor.getEan13forProdno(prodno).size == 0
+              if Oddb2xml.getEan13forProdno(prodno).size == 0
                 puts "No item found for prodno #{prodno} no8 #{obj[:no8]} #{sequence[:name_de]} "
                 next
               end
@@ -1666,7 +1681,7 @@ module Oddb2xml
       lines << "  - #{sprintf('%5d', @products.size)} products"
       lines << "  - #{sprintf('%5d', @limitations.size)} limitations"
       lines << "  - #{sprintf('%5d', @nr_articles)} articles"
-      lines << "  - #{sprintf('%5d', @@gtin2ignore.size)} ignored @gtins"
+      lines << "  - #{sprintf('%5d', @@gtin2ignore.size)} ignored GTINS"
       @@articlestamm_v5_info_lines = lines
       _builder.to_xml({:indent => 4, :encoding => 'UTF-8'})
     end

data/lib/oddb2xml/extractor.rb

@@ -38,6 +38,10 @@ module Oddb2xml
       data = {}
       result = PreparationsEntry.parse(@xml.sub(Strip_For_Sax_Machine, ''), :lazy => true)
       result.Preparations.Preparation.each do |seq|
+        if seq.SwissmedicNo5.eql?('0')
+          puts "BagXmlExtractor Skipping SwissmedicNo5 0 for #{seq.NameDe} #{seq.DescriptionDe} #{seq.CommentDe}"
+          next
+        end
         item = {}
         item[:data_origin]  = 'bag_xml'
         item[:refdata]      = true
@@ -72,19 +76,21 @@ module Oddb2xml
         item[:packages]    = {} # pharmacode => package
         seq.Packs.Pack.each do |pac|
           if pac.SwissmedicNo8 && pac.SwissmedicNo8.length < 8
-            puts "BagXmlExtractor: Adding leading zeros for SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}"
+            puts "BagXmlExtractor: Adding leading zeros for SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}" if $VERBOSE
             pac.SwissmedicNo8  = pac.SwissmedicNo8.rjust(8, '0')
           end
           unless pac.GTIN
             unless pac.SwissmedicNo8
-              puts "BagXmlExtractor: Skipping as missing GTIN in SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}. Skipping"
+              puts "BagXmlExtractor: Missing GTIN and SwissmedicNo8 in SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}"
+              next
             else
               ean12 = '7680' + pac.SwissmedicNo8
               pac.GTIN  = (ean12 + Oddb2xml.calc_checksum(ean12)) unless @artikelstamm
-              puts "BagXmlExtractor: Missing GTIN in SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}."
+              # puts "BagXmlExtractor: Missing GTIN in SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}."
             end
           end
           ean13 = pac.GTIN.to_s
+          Oddb2xml.setEan13forNo8(pac.SwissmedicNo8, ean13) if pac.SwissmedicNo8
           # packages
           exf = {:price => '', :valid_date => '', :price_code => ''}
           if pac.Prices and pac.Prices.ExFactoryPrice
@@ -100,6 +106,11 @@ module Oddb2xml
           end
           item[:packages][ean13] = {
             :ean13               => ean13,
+            :name_de             => (desc = seq.NameDe) ? desc : '',
+            :name_fr             => (desc = seq.NameFr) ? desc : '',
+            :desc_de             => (desc = pac.DescriptionDe) ? desc : '',
+            :desc_fr             => (desc = pac.DescriptionFr) ? desc : '',
+            :sl_entry            => true,
             :swissmedic_category => (cat = pac.SwissmedicCategory) ? cat : '',
             :swissmedic_number8  => (num = pac.SwissmedicNo8)      ? num : '',
             :prices              => { :exf_price => exf, :pub_price => pub },
@@ -168,6 +179,14 @@ module Oddb2xml
           # limitation points
           pts = pac.PointLimitations.PointLimitation.first # only first points
           item[:packages][ean13][:limitation_points] = pts ? pts.Points : ''
+          if pac.SwissmedicNo8
+              ean12 = '7680' + pac.SwissmedicNo8
+              correct_ean13 = ean12+ Oddb2xml.calc_checksum(ean12)
+              unless pac.GTIN.eql?(correct_ean13)
+                puts "pac.GTIN #{pac.GTIN} should be #{correct_ean13}"
+                item[:packages][ean13][:CORRECT_EAN13] = correct_ean13
+              end
+          end
           data[ean13] = item
         end
       end
@@ -196,11 +215,12 @@ module Oddb2xml
         end
         # but in refdata_nonPharma we have a about 700 GTINs which are 14 characters and longer
         item = {}
+        item[:ean13]           = ean13
+        item[:no8]             = pac.SWMC_AUTHNR
+        item[:pharmacode]      = (phar = pac.PHAR.to_s)   ? phar: '0'
         item[:data_origin]     = 'refdata'
         item[:refdata]         = true
         item[:_type]           = (typ  = pac.ATYPE.downcase.to_sym)  ? typ: ''
-        item[:ean13]           = ean13
-        item[:pharmacode]      = (phar = pac.PHAR.to_s)   ? phar: '0'
         item[:last_change]     = (date = Time.parse(pac.DT).to_s)  ? date: ''  # Date and time of last data change
         item[:desc_de]         = (dscr = pac.NAME_DE)   ? dscr: ''
         item[:desc_fr]         = (dscr = pac.NAME_FR)   ? dscr: ''
@@ -225,17 +245,8 @@ module Oddb2xml
       @type  = type
       Oddb2xml.log("SwissmedicExtractor #{@filename} #{File.size(@filename)} bytes")
       return unless File.exists?(@filename)
-      @@prodno_to_ean13 = {}
-      @@ean13_to_prodno = {}
       @sheet = RubyXL::Parser.parse(File.expand_path(@filename)).worksheets[0]
     end
-    # Needed for ensuring consitency for the Artikelstamm
-    def self.getEan13forProdno(prodno)
-      @@prodno_to_ean13[prodno] || []
-    end
-    def self.getProdnoForEan13(ean13)
-      @@ean13_to_prodno[ean13]
-    end
     def to_arry
       data = []
       return data unless @sheet
@@ -304,15 +315,14 @@ module Oddb2xml
             ean_base12 = "7680#{no8}"
             prodno =  Oddb2xml.gen_prodno(row[iksnr].value.to_i, row[seqnr].value.to_i)
             ean13 = (ean_base12.ljust(12, '0') + Oddb2xml.calc_checksum(ean_base12))
-            @@prodno_to_ean13[prodno] ||= []
-            @@prodno_to_ean13[prodno] << ean13
-            @@ean13_to_prodno[ean13] = prodno
+            Oddb2xml.setEan13forProdno(prodno, ean13)
+            Oddb2xml.setEan13forNo8(no8, ean13)
             data[no8] = {
+              :no8                  => no8,
               :ean13                => ean13,
               :prodno               => prodno,
               :seqnr                => row[seqnr].value,
-              :iksnr                => row[iksnr].value,
-              :ith_swissmedic       => row[ith] ? row[ith].value.to_s : '',
+               :ith_swissmedic       => row[ith] ? row[ith].value.to_s : '',
               :swissmedic_category  => row[cat].value.to_s,
               :atc_code             => row[atc] ? Oddb2xml.add_epha_changes_for_ATC(row[iksnr].value.to_s, row[atc].value.to_s) : '',
               :list_code            => row[list_code] ? row[list_code].value.to_s : '',
@@ -513,6 +523,7 @@ module Oddb2xml
       while line = @io.gets
         ean13 = "-1"
         line = Oddb2xml.patch_some_utf8(line).chomp
+        # next unless /(7680\d{9})(\d{1})$/.match(line) # Skip non pharma
         next if line =~ /(ad us\.* vet)|(\(vet\))/i
         if @@extended
           next unless line =~ /(\d{13})(\d{1})$/

data/lib/oddb2xml/util.rb

@@ -185,4 +185,41 @@ module Oddb2xml
     end
   end
 
+  # Needed for ensuring consistency for the Artikelstamm
+  @@prodno_to_ean13 = {}
+  @@no8_to_ean13 = {}
+  @@ean13_to_prodno = {}
+  @@ean13_to_no8 = {}
+    def Oddb2xml.setEan13forProdno(prodno, ean13)
+      if ean13.to_i == 7680006660045  ||  ean13.to_i == 7680006660014
+        puts "setEan13forProdno #{prodno} ean13 #{ean13}"
+      end
+      @@prodno_to_ean13[prodno] ||= []
+      @@prodno_to_ean13[prodno] << ean13
+      @@ean13_to_prodno[ean13] = prodno
+    end
+    def Oddb2xml.setEan13forNo8(no8, ean13)
+      if ean13.to_i == 7680006660045  ||  ean13.to_i == 7680006660014
+        puts "setEan13forNo8 #{no8} ean13 #{ean13}"
+      end
+      if @@no8_to_ean13[no8].nil?
+        @@no8_to_ean13[no8] = ean13
+        @@ean13_to_no8[ean13] = no8
+      elsif !@@no8_to_ean13[no8].eql?(ean13)
+        puts "@@no8_to_ean13[no8] #{@@no8_to_ean13[no8]} not overridden by #{ean13}"
+      end
+    end
+    def Oddb2xml.getEan13forProdno(prodno)
+      @@prodno_to_ean13[prodno] || []
+    end
+    def Oddb2xml.getEan13forNo8(no8)
+      @@no8_to_ean13[no8] || []
+    end
+    def Oddb2xml.getProdnoForEan13(ean13)
+      @@ean13_to_prodno[ean13]
+    end
+    def Oddb2xml.getNo8ForEan13(ean13)
+      @@ean13_to_no8[ean13]
+    end
+
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.5.3"
+  VERSION = "2.5.4"
 end

data/spec/artikelstamm_spec.rb

@@ -24,7 +24,7 @@ describe Oddb2xml::Builder do
     unless @inhalt.index(expected_value)
       puts expected_value
     end
-    binding.pry unless @inhalt.index(expected_value)
+    # binding.pry unless @inhalt.index(expected_value)
     expect(@inhalt.index(expected_value)).not_to be nil
   end
   def common_run_init(options = {})
@@ -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, orale Tropflösung",Flasche(n),Flasche(n),5,9.25,6585601,A11CC05,cholecalciferolum,,07.02.3.,SL)
+      expected = %(7680658560014,"Dibase 10'000, Tropfen 10000 IE/ml",Flasche(n),Flasche(n),5,9.25,6585601,A11CC05,cholecalciferolum,,07.02.3.,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')).not_to be nil
+      expect(inhalt.index('7680651600014,Lynparza Kaps 50 mg 448 Stk,,Kapsel(n),5562.48,5947.55,,,,"",,SL')).not_to be nil
     end
     it 'should trim the ean13 to 13 length' do
       gtin14 = "00040565124346"
@@ -217,32 +217,46 @@ describe Oddb2xml::Builder do
             <GTIN>7680658560014</GTIN>
             <!--override  with-->
             <SALECD>A</SALECD>
-            <DSCR>DIBASE 10'000, orale Tropflösung</DSCR>
-            <DSCRF>--missing--</DSCRF>)
+            <DSCR>Dibase 10'000, Tropfen 10000 IE/ml</DSCR>
+            <DSCRF>Dibase 10'000, gouttes 10000 UI/ml</DSCRF>
+            <COMP>
+                <NAME>Gebro Pharma AG</NAME>
+                <GLN/>
+            </COMP>
+            <PEXF>5</PEXF>
+            <PPUB>9.25</PPUB>
+            <PKG_SIZE>1</PKG_SIZE>
+            <MEASURE>Flasche(n)</MEASURE>
+            <MEASUREF>Flasche(n)</MEASUREF>
+            <DOSAGE_FORM>orale Tropflösung</DOSAGE_FORM>
+            <SL_ENTRY>true</SL_ENTRY>
+            <IKSCAT>D</IKSCAT>
+            <DEDUCTIBLE>10</DEDUCTIBLE>
+            <PRODNO>6585601</PRODNO>
+        </ITEM>)
       expect(@inhalt.index(expected)).not_to be nil
     end
     
-    it 'should contain a public price if the item was only in the SL liste (Preparations.xml)' do
-      # same as 7680403330459 CARBADERM
-      expect(@inhalt.index('<PPUB>27.70</PPUB>')).not_to be nil
-    end
     it 'should contain PEVISONE Creme 30 g' do
-      expect(@inhalt.index('PEVISONE Creme 15 g')).not_to be nil # 7680406620144
-      expect(@inhalt.index('PEVISONE Creme 30 g')).not_to be nil # 7680406620229
+      expect(@inhalt.index('Pevisone Creme 15 g')).not_to be nil # 7680406620144
+      expect(@inhalt.index('Pevisone Creme 30 g')).not_to be nil # 7680406620229
       # Should also check for price!
     end
     it 'should validate against artikelstamm.xsd' do
       validate_via_xsd(@elexis_v5_xsd, @artikelstamm_name)
     end
-      tests = { 'item 7680403330459 CARBADERM only in Preparations(SL)' =>
+      tests = { 'item 7680403330459 CARBADERM only in Preparations(SL) with public price' =>
         %(<ITEM PHARMATYPE="P">
             <GTIN>7680403330459</GTIN>
             <PHAR>3603779</PHAR>
             <SALECD>A</SALECD>
-            <DSCR>CARBADERM Creme Tb 300 ml</DSCR>
-            <DSCRF>--missing--</DSCRF>
-            <PEXF>16.22</PEXF>
-            <PPUB>27.70</PPUB>
+            <DSCR>Carbaderm Creme Tb 300 ml</DSCR>
+            <DSCRF>Carbaderm crème tb 300 ml</DSCRF>
+            <PEXF>14.61</PEXF>
+            <PPUB>26.95</PPUB>
+            <SL_ENTRY>true</SL_ENTRY>
+            <IKSCAT>D</IKSCAT>
+            <DEDUCTIBLE>10</DEDUCTIBLE>
         </ITEM>),
         'item 4042809018288 TENSOPLAST' =>
       %(<ITEM PHARMATYPE="N">
@@ -296,13 +310,13 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>10</DEDUCTIBLE>
             <PRODNO>5366201</PRODNO>
         </ITEM>),
-        'item 7680161050583 HIRUDOID' =>
+        'item 7680161050583 HIRUDOID 40g' =>
          %(<ITEM PHARMATYPE="P">
             <GTIN>7680161050583</GTIN>
             <PHAR>2731179</PHAR>
             <SALECD>A</SALECD>
-            <DSCR>HIRUDOID Creme 3 mg/g 40 g</DSCR>
-            <DSCRF>HIRUDOID crème 3 mg/g 40 g</DSCRF>
+            <DSCR>Hirudoid Creme 3 mg/g 40 g</DSCR>
+            <DSCRF>Hirudoid crème 3 mg/g 40 g</DSCRF>
             <COMP>
                 <NAME>Medinova AG</NAME>
                 <GLN>7601001002258</GLN>
@@ -318,12 +332,29 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>10</DEDUCTIBLE>
             <PRODNO>1610501</PRODNO>
         </ITEM>),
+        'item 7680161050743 100g ' => 
+              %( <ITEM PHARMATYPE="P">
+            <GTIN>7680161050743</GTIN>
+            <PHAR>2731179</PHAR>
+            <SALECD>A</SALECD>
+            <DSCR>Hirudoid Creme 3 mg/g 100 g</DSCR>
+            <DSCRF>Hirudoid crème 3 mg/g 100 g</DSCRF>
+            <COMP>
+                <NAME>Medinova AG</NAME>
+                <GLN>7601001002258</GLN>
+            </COMP>
+            <PEXF>9.555316</PEXF>
+            <PPUB>17.65</PPUB>
+            <SL_ENTRY>true</SL_ENTRY>
+            <IKSCAT>D</IKSCAT>
+            <DEDUCTIBLE>10</DEDUCTIBLE>
+        </ITEM>), 
         'item 7680284860144 ANCOPIR' =>'<ITEM PHARMATYPE="P">
             <GTIN>7680284860144</GTIN>
             <PHAR>0177804</PHAR>
             <SALECD>A</SALECD>
-            <DSCR>Ancopir, Injektionslösung</DSCR>
-            <DSCRF>--missing--</DSCRF>
+            <DSCR>ANCOPIR Inj Lös 5 Amp 2 ml</DSCR>
+            <DSCRF>Ancopir, sol inj</DSCRF>
             <COMP>
                 <NAME>Dr. Grossmann AG, Pharmaca</NAME>
                 <GLN/>
@@ -340,7 +371,7 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>10</DEDUCTIBLE>
             <PRODNO>2848601</PRODNO>
         </ITEM>',
-                'FERROUMET pice from ZurRose  ' => %(<ITEM PHARMATYPE="P">
+                'FERRO-GRADUMET price from ZurRose  ' => %(<ITEM PHARMATYPE="P">
             <GTIN>7680316440115</GTIN>
             <PHAR>0020244</PHAR>
             <SALECD>A</SALECD>
@@ -389,8 +420,8 @@ describe Oddb2xml::Builder do
             <GTIN>7680532900196</GTIN>
             <PHAR>1699999</PHAR>
             <SALECD>A</SALECD>
-            <DSCR>HUMALOG Inj Lös 100 IE/ml Durchstf 10 ml</DSCR>
-            <DSCRF>HUMALOG sol inj 100 UI/ml flac 10 ml</DSCRF>
+            <DSCR>Humalog Inj Lös Durchstf 10 ml</DSCR>
+            <DSCRF>Humalog sol inj flac 10 ml</DSCRF>
             <COMP>
                 <NAME>Eli Lilly (Suisse) SA</NAME>
                 <GLN>7601001261853</GLN>

data/spec/builder_spec.rb

@@ -456,7 +456,7 @@ def checkProductXml(nbr_record = -1)
   expect(desitin.elements['SubstanceSwissmedic'].text).to eq 'levetiracetamum'
   expect(desitin.elements['CompositionSwissmedic'].text).to eq 'levetiracetamum 250 mg, excipiens pro compressi obducti pro charta.'
   expect(desitin.elements['CPT/CPTCMP/LINE'].text).to eq '0'
-  expect(desitin.elements['CPT/CPTCMP/SUBNO'].text).to eq '15'
+  expect(desitin.elements['CPT/CPTCMP/SUBNO'].text).to eq '13'
   expect(desitin.elements['CPT/CPTCMP/QTY'].text).to eq '250'
   expect(desitin.elements['CPT/CPTCMP/QTYU'].text).to eq 'mg'
 
@@ -474,7 +474,7 @@ end
 
 describe Oddb2xml::Builder do
   NrExtendedArticles = 74
-  NrSubstances = 30
+  NrSubstances = 27
   NrLimitations = 14
   
   NrInteractions = 2

data/spec/extractor_spec.rb

@@ -69,6 +69,7 @@ describe Oddb2xml::RefdataExtractor do
         :refdata=>true,
         :_type=>:pharma,
         :ean13=> Oddb2xml::LEVETIRACETAM_GTIN.to_s,
+        :no8 => "62069008",
         :pharmacode=> pharma_code_LEVETIRACETAM,
         :data_origin => "refdata",
         :desc_de=>"LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk",
@@ -95,6 +96,7 @@ describe Oddb2xml::RefdataExtractor do
       expected = {:refdata=>true,
       :_type=>:nonpharma,
       :ean13=>'7611600441020',
+      :no8 => nil,
       :pharmacode=>pharma_code_TUBEGAZE,
       :last_change => @@last_change,
       :data_origin => "refdata",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip