oddb2xml 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09c85343784bea903af64ee40b29749dfdfc2af55000673244129510276c88a
-  data.tar.gz: 7a8cbd05765da37ec1d582c13bb71758c05a0ddd73773aea5084fa211ebf98d2
+  metadata.gz: c31777bcd85038bd65d38d67d6ebdf2197f174389403b76ff146b18d3ef4557e
+  data.tar.gz: 8d8930ed04518838084ae4aeb69181418b2eddb36cfa83ece2cbc84ccd06e1f4
 SHA512:
-  metadata.gz: 5be02fa2ec4dff0aa6f8c4a4dbfba9cc0f272831fd0b10b6a1af1a18fd3cff3956ad0884de9e81c19c31d60984cc5d234586372aa7a0d34acdab9015cf7252d8
-  data.tar.gz: ea9317a80ad372959d59f0a13614a9a5a8a1f5da3befa9202f5dadbcb23a41523580184c9a769fb512ba7256f5d36b97dffc214424d4d70df499cb35b6c9371e
+  metadata.gz: abe9685cc40ba1fbf9525c3cbeb9f332a98725e76621074c9f1df179c91e53cb50a4f15e78a800a28224351d3a47ec8aef0e3b9ee17787a8dccd519db65bc6d8
+  data.tar.gz: 415b9049a316af98279f7af0b602ecd85b0bd2e86493133af512d37b494d43155822ef754ad6dcaa39b1aa474fddba57081860588b7e896da13bf891e9b522d6

data/.github/workflows/ruby.yml

@@ -0,0 +1,40 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+# Using a matrix fails, because /setup-ruby always invokes bundle install without any additional args
+# Fixed by adding not defining the debugger group in the Gemfile
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu]
+        ruby: [2.4, 2.5, 2.6, 2.7, 3.0, head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - name: Install dependencies
+      run: |
+        bundle config set path .bundle/gems --local
+        bundle config set without debugger  --local
+        bundle install
+    - name: Test with RSpec
+      run: bundle exec rspec

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.7.1 / 03.02.2021
+* travis-ci -> Github Actions
+* limit DSCRD/DSCRF to 120 chars as specified in the XSD
+* Use huge option for nokogiri as suggested by  https://github.com/sparklemotion/nokogiri/issues/2187
+* Adapt artikelstamm to refdata without pharmacode
+* oddb_article get pharmacode where possible from transfer.dat
+
 === 2.7.0 / 05.11.2020
 * Chapter70 hack nur als Kommentar
 * Avoid double hyphen in comment

data/lib/oddb2xml/builder.rb

@@ -520,7 +520,7 @@ module Oddb2xml
           return false
         end
         return false if !name || name.empty? || name.length < 3
-        name
+        name[0..119] # limit to maximal 120 chars as specified in the XSD
       end
       prepare_substances
       prepare_products
@@ -886,8 +886,12 @@ module Oddb2xml
             xml.ART('DT' => obj[:last_change] ? obj[:last_change] : '') do
               nbr_records += 1
               xml.REF_DATA (obj[:refdata] || @migel[pharma_code]) ? '1' : '0'
-              # xml.PHAR  sprintf('%07d', obj[:pharmacode]) if obj[:pharmacode]
-              xml.PHAR  obj[:pharmacode] if obj[:pharmacode]
+              if obj[:pharmacode] && obj[:pharmacode].length > 0
+                xml.PHAR  obj[:pharmacode]
+              elsif zur_rose
+                puts "Adding #{zur_rose[:pharmacode]} to article GTIN #{ean}"
+                xml.PHAR  zur_rose[:pharmacode]
+              end
               #xml.GRPCD
               #xml.CDS01
               #xml.CDS02
@@ -988,14 +992,7 @@ module Oddb2xml
                 xml.CDTYP  'E13'
                 xml.BC     ean #  /^9999|^0000|^0$/.match(ean.to_s) ? 0 : sprintf('%013d', ean)
                 xml.BCSTAT 'A' # P is alternative
-                #xml.PHAR2
               } if ean
-              #xml.ARTCH {
-                #xml.PHAR2
-                #xml.CHTYPE
-                #xml.LINENO
-                #xml.NOUNITS
-              #}
               if pac and pac[:prices]
                 pac[:prices].each_pair do |key, price|
                   xml.ARTPRI {
@@ -1413,7 +1410,7 @@ module Oddb2xml
           return '--missing--'
         end
         return '--missing--' if !name || name.empty? || name.length < 3
-        name
+        name[0..119] # limit to maximal 120 chars as specified in the XSD
       end
       def override(xml, id, field, default_value)
         has_overrides =  /\d{13}/.match(id.to_s) ? @@article_overrides[id.to_i] : @@product_overrides[id.to_i]
@@ -1499,7 +1496,6 @@ module Oddb2xml
                 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
@@ -1598,7 +1594,7 @@ module Oddb2xml
             next if /^#{Oddb2xml::FAKE_GTIN_START}/.match(ean13.to_s)
             xml.ITEM({'PHARMATYPE' => patched_pharma_type }) do
               xml.GTIN ean13.to_s.rjust(13, '0')
-              xml.PHAR obj[:pharmacode]
+              xml.PHAR obj[:pharmacode] if obj[:pharmacode] && obj[:pharmacode].length > 0
               emit_salecd(xml, ean13, obj)
               description = obj[:desc_de] || obj[:description] # for description for zur_rose
               xml.DSCR(description)

data/lib/oddb2xml/extractor.rb

@@ -218,7 +218,6 @@ module Oddb2xml
         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: ''
@@ -228,12 +227,6 @@ module Oddb2xml
         item[:atc_code]        = (code = pac.ATC)    ? code.to_s : ''
         item[:company_name] = (nam = pac.AUTH_HOLDER_NAME) ? nam: ''
         item[:company_ean]  = (gln = pac.AUTH_HOLDER_GLN)  ? gln: ''
-        unless item[:pharmacode]
-          item[:pharmacode] = phar
-          unless data[item[:pharmacode]] # pharmacode => GTINs
-            data[item[:ean13]] = []
-          end
-        end
         data[item[:ean13]] = item
       end
       data

data/lib/oddb2xml/util.rb

@@ -191,7 +191,9 @@ COLUMNS_FEBRUARY_2019= {
         :drug_index       => /Verz. bei betäubun.*smittel-haltigen Präparaten/i,
     }
   def Oddb2xml.add_hash(string)
-    doc = Nokogiri::XML.parse(string)
+    doc = Nokogiri::XML.parse(string) do |config|
+      config.huge
+    end
     nr = 0
     doc.root.elements.each do |node|
       nr += 1

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

data/oddb2xml.gemspec

@@ -37,6 +37,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'xml-simple'
   spec.add_dependency 'ox'
   spec.add_dependency 'htmlentities'
+  spec.add_dependency 'webrick'
+  spec.add_dependency 'rexml'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

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 if defined?(Pry) && !@inhalt.index(expected_value)
     expect(@inhalt.index(expected_value)).not_to be nil
   end
   def common_run_init(options = {})
@@ -71,17 +71,16 @@ describe Oddb2xml::Builder do
     end
 
     it 'should have a GTIN and a public price with 14 chars (ean14)' do
+      # Till January 2021 it was possible to find a price via transfer.dat
+      # as the pharmacode was given in the refdata_NonPharma.xml
       expected = %(<ITEM PHARMATYPE="N">
             <GTIN>68711428066649</GTIN>
-            <PHAR>5863450</PHAR>
             <SALECD>A</SALECD>
             <DSCR>3M MEDIPORE+PAD Absorbtionsverb 10x15cm 8 x 25 Stk</DSCR>
             <DSCRF>3M MEDIPORE+PAD compr absorb 10x15cm 8 x 25 pce</DSCRF>
             <COMP>
                 <GLN>7610182000007</GLN>
             </COMP>
-            <PEXF>108.01</PEXF>
-            <PPUB>178.20</PPUB>
         </ITEM>)
       expect(@inhalt.index(expected)).not_to be nil
     end
@@ -160,12 +159,6 @@ describe Oddb2xml::Builder do
       expect(@inhalt.index('GTIN>0')).to be > 0
     end
 
-    it 'should contain a PHAR 4236857 from refdata_NonPharma.xml' do
-      expect(@inhalt.index('<PHAR>4236863</PHAR>')).to be > 0
-      # Marco leaves the 14 GTIN digit in previous importes. As of January 2018 force it to the 13 digits
-      expect(@inhalt.index('<GTIN>0040565124346</GTIN>')).to be > 0
-    end
-
     it 'should a DSCRF for 4042809018288 TENSOPLAST Kompressionsbinde 5cmx4.5m' do
       skip("Where does the DSCR for 4042809018288 come from. It should be TENSOPLAST bande compression 5cmx4.5m")
     end
@@ -215,8 +208,6 @@ describe Oddb2xml::Builder do
     it 'should contain DIBASE with phar' do
       expected = %(<ITEM PHARMATYPE="P">
             <GTIN>7680658560014</GTIN>
-            <!--obsolete override-->
-            <PHAR>7199565</PHAR>
             <SALECD>A</SALECD>
             <DSCR>Dibase 10'000 Tropfen 10000 IE/ml Fl 10 ml</DSCR>
             <DSCRF>Dibase 10'000 gouttes 10000 UI/ml fl 10 ml</DSCRF>
@@ -249,7 +240,6 @@ describe Oddb2xml::Builder do
       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>Carbaderm crème tb 300 ml</DSCRF>
@@ -271,7 +261,6 @@ describe Oddb2xml::Builder do
         </ITEM>),
          'product 3247501 LANSOYL' => '<ITEM PHARMATYPE="P">
             <GTIN>7680324750190</GTIN>
-            <PHAR>0023722</PHAR>
             <SALECD>A</SALECD>
             <DSCR>LANSOYL Gel 225 g</DSCR>
             <DSCRF>LANSOYL gel 225 g</DSCRF>
@@ -290,7 +279,6 @@ describe Oddb2xml::Builder do
         'product 5366201 3TC' =>
       %(<ITEM PHARMATYPE="P">
             <GTIN>7680536620137</GTIN>
-            <PHAR>1699947</PHAR>
             <SALECD>A</SALECD>
             <DSCR>3TC Filmtabl 150 mg 60 Stk</DSCR>
             <DSCRF>3TC cpr pell 150 mg 60 pce</DSCRF>
@@ -314,7 +302,6 @@ describe Oddb2xml::Builder do
         '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>
@@ -336,7 +323,6 @@ describe Oddb2xml::Builder do
         'item 7680161050743 Hirudoid Creme 3 mg/g 100 g' =>
               %( <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>
@@ -352,7 +338,6 @@ describe Oddb2xml::Builder do
         </ITEM>),
         'item 7680284860144 ANCOPIR' =>'<ITEM PHARMATYPE="P">
             <GTIN>7680284860144</GTIN>
-            <PHAR>0177804</PHAR>
             <SALECD>A</SALECD>
             <DSCR>ANCOPIR Inj Lös 5 Amp 2 ml</DSCR>
             <DSCRF>Ancopir, sol inj</DSCRF>
@@ -374,7 +359,6 @@ describe Oddb2xml::Builder do
         </ITEM>',
                 'FERRO-GRADUMET price from ZurRose  ' => %(<ITEM PHARMATYPE="P">
             <GTIN>7680316440115</GTIN>
-            <PHAR>0020244</PHAR>
             <SALECD>A</SALECD>
             <DSCR>FERRO-GRADUMET Depottabl 30 Stk</DSCR>
             <DSCRF>FERRO-GRADUMET cpr dépôt 30 pce</DSCRF>
@@ -402,7 +386,6 @@ describe Oddb2xml::Builder do
         </PRODUCT>),
         'nur aus Packungen Coeur-Vaisseaux Sérocytol,' => %(<ITEM PHARMATYPE="P">
             <GTIN>7680002770014</GTIN>
-            <PHAR>0361815</PHAR>
             <SALECD>A</SALECD>
             <DSCR>SEROCYTOL Herz-Gefässe Supp 3 Stk</DSCR>
             <DSCRF>SEROCYTOL Coeur-Vaisseaux supp 3 pce</DSCRF>
@@ -419,7 +402,6 @@ describe Oddb2xml::Builder do
         </ITEM>),
         'HUMALOG (Richter)' => %(<ITEM PHARMATYPE="P">
             <GTIN>7680532900196</GTIN>
-            <PHAR>1699999</PHAR>
             <SALECD>A</SALECD>
             <DSCR>Humalog Inj Lös Durchstf 10 ml</DSCR>
             <DSCRF>Humalog sol inj flac 10 ml</DSCRF>
@@ -450,7 +432,6 @@ describe Oddb2xml::Builder do
         </PRODUCT>),
         'Varilrix item' => %(<ITEM PHARMATYPE="P">
             <GTIN>7680005850010</GTIN>
-            <PHAR>1770177</PHAR>
             <SALECD>A</SALECD>
             <DSCR>Varilrix Trockensub c solv Fertspr 0.500 ml</DSCR>
             <DSCRF>Varilrix subst sèche c solv ser prê 0.500 ml</DSCRF>

data/spec/builder_spec.rb

@@ -39,7 +39,6 @@ ARTICLE_ZURROSE_ELEMENTS =    [
 ]
 
 ARTICLE_NAROPIN = %(<REF_DATA>1</REF_DATA>
-    <PHAR>1882189</PHAR>
     <SMCAT>B</SMCAT>
     <SMNO>54015011</SMNO>
     <PRODNO>5401501</PRODNO>
@@ -259,16 +258,6 @@ def check_result(inhalt, nbr_record)
   expect(m[1].to_i).to eq  nbr_record
 end
 
-def checkItemForRefdata(doc, pharmacode, isRefdata)
-  article = XPath.match( doc, "//ART[PHAR=#{pharmacode.to_s}]").first
-  name =     article.elements['DSCRD'].text
-  refdata =  article.elements['REF_DATA'].text
-  smno    =  article.elements['SMNO'] ? article.elements['SMNO'].text : 'nil'
-  puts "checking doc for gtin #{gtin} isRefdata #{isRefdata} == #{refdata}. SMNO: #{smno} #{name}" if $VERBOSE
-  expect(article.elements['REF_DATA'].text).to eq(isRefdata.to_s)
-  article
-end
-
 ['article', 'betrieb', 'code', 'interaction', 'limitation', 'medizinalperson', 'product', 'substance'].each do |cat|
   eval "
     def oddb_#{cat}_xml
@@ -408,7 +397,7 @@ def checkArticleXml(checkERYTHROCIN = true)
   expect(desitin.elements['DSCRD'].text).to eq("LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk")
   expect(desitin.elements['DSCRF'].text).to eq('LEVETIRACETAM DESITIN mini cpr pel 250 mg 30 pce')
   expect(desitin.elements['REF_DATA'].text).to eq('1')
-  expect(desitin.elements['PHAR'].text).to eq('5819012')
+  expect(desitin.elements['PHAR'].text).to eq('5819012') 
   expect(desitin.elements['SMCAT'].text).to eq('B')
   expect(desitin.elements['SMNO'].text).to eq('62069008')
   expect(desitin.elements['VAT'].text).to eq('2')
@@ -473,7 +462,7 @@ def checkProductXml(nbr_record = -1)
 end
 
 describe Oddb2xml::Builder do
-  NrExtendedArticles = 78
+  NrExtendedArticles = 80
   NrSubstances = 28
   NrLimitations = 15
 
@@ -482,7 +471,7 @@ describe Oddb2xml::Builder do
   NrProdno = 31
   NrPackages = 46
   NrProducts = 40
-  RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
+  RegExpDesitin = /1120000000LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
   include ServerMockHelper
   def common_run_init(options = {})
     @savedDir = Dir.pwd
@@ -516,6 +505,11 @@ describe Oddb2xml::Builder do
       check_result(@inhalt, NrProducts)
     end
 
+    it 'should have a correct NBR_RECORD in oddb_products.xml' do
+      oddb_product_xml = oddb_article_xml.sub('oddb_article.xml', 'oddb_product.xml')
+      check_result(File.read(oddb_product_xml), 46)
+    end
+
     it 'oddb_article.xml should contain a SHA256' do
       expect(XPath.match(@rexml, "//ART" ).first.attributes['SHA256'].size).to eq 64
       expect(XPath.match(@rexml, "//ART" ).size).to eq XPath.match(@rexml, "//ART" ).size
@@ -821,19 +815,12 @@ describe Oddb2xml::Builder do
 
     it 'should generate the flag non-refdata' do
       doc = REXML::Document.new File.new(checkAndGetArticleXmlName('non-refdata'))
-      expect(XPath.match( doc, "//REF_DATA" ).size).to be > 0
-      checkItemForRefdata(doc, "1699947", 1) # 3TC Filmtabl 150 mg SMNO 53662013 IKSNR 53‘662, 53‘663
-      checkItemForRefdata(doc, "0598003", 0) # SOFRADEX Gtt Auric 8 ml
-      checkItemForRefdata(doc, "5366964", 0) # 1-DAY ACUVUE moist jour
-      unless SkipMigelDownloader
-        novopen = checkItemForRefdata(doc, "3036984", 1) # NovoPen 4 Injektionsgerät blue In NonPharma (a MiGel product)
-        expect(novopen.elements['ARTBAR/BC'].text).to eq '0'
-      end
+      expect(XPath.match( doc, "//REF_DATA" ).size).to eq NrExtendedArticles
     end
 
     it 'should generate SALECD A for migel (NINCD 13)' do
       doc = REXML::Document.new File.new(checkAndGetArticleXmlName)
-      article = XPath.match( doc, "//ART[PHAR=4236863]").first
+      article = XPath.match( doc, "//ART[DSCRD='ACTICOAT Flex 7 Wundverband 10x12.5cm 5 Stk']").first
       expect(article.elements['SALECD'].text).to eq('A')
       expect(article.elements['ARTINS/NINCD'].text).to eq('13')
     end
@@ -860,12 +847,12 @@ describe Oddb2xml::Builder do
     end
 
     it 'should load correct number of nonpharma' do
+      puts checkAndGetArticleXmlName
       doc = REXML::Document.new File.new(checkAndGetArticleXmlName)
       dscrds = XPath.match( doc, "//ART" )
       expect(dscrds.size).to eq(NrExtendedArticles)
-      expect(XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('1699947') }.size).to eq(1) # swissmedic_packages Cardio-Pulmo-Rénal Sérocytol, suppositoire
-      expect(XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('2465312') }.size).to eq(1) # from refdata_pharma.xml"
       expect(XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('0000000') }.size).to eq(0) # 0 is not a valid pharmacode
+      expect(XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match(/\d+/)}.size).to eq 65
     end
 
     it 'should have a correct NBR_RECORD in oddb_limitation.xml' do

data/spec/data/refdata_NonPharma.xml

@@ -5,7 +5,6 @@
       <ITEM DT="2015-11-24 00:00:00 +000">
         <ATYPE>NONPHARMA</ATYPE>
         <GTIN>7611600441020</GTIN>
-        <PHAR>0058519</PHAR>
         <NAME_DE>TUBEGAZE Verband weiss Nr 12 20m Finger gross</NAME_DE>
         <NAME_FR>TUBEGAZE pans tubul blanc Nr 12 20m doigts grands</NAME_FR>
         <AUTH_HOLDER_NAME>IVF HARTMANN AG</AUTH_HOLDER_NAME>
@@ -14,7 +13,6 @@
       <ITEM DT="2015-11-24 00:00:00 +000">
         <ATYPE>NONPHARMA</ATYPE>
         <GTIN>00040565124308</GTIN>
-        <PHAR>4236863</PHAR>
         <NAME_DE>ACTICOAT Flex 7 Wundverband 10x12.5cm 5 Stk</NAME_DE>
         <NAME_FR>ACTICOAT Flex 7 pansement vulné 10x12.5cm 5 pce</NAME_FR>
         <AUTH_HOLDER_NAME>Smith &amp; Nephew Schweiz AG</AUTH_HOLDER_NAME>
@@ -32,7 +30,6 @@
       <ITEM DT="2018-03-16T00:00:00">
         <ATYPE>NONPHARMA</ATYPE>
         <GTIN>68711428066649</GTIN>
-        <PHAR>5863450</PHAR>
         <NAME_DE>3M MEDIPORE+PAD Absorbtionsverb 10x15cm 8 x 25 Stk</NAME_DE>
         <NAME_FR>3M MEDIPORE+PAD compr absorb 10x15cm 8 x 25 pce</NAME_FR>
         <AUTH_HOLDER_NAME>3M (Schweiz) GmbH (Professional Health Care)</AUTH_HOLDER_NAME>

data/spec/data/refdata_Pharma.xml

@@ -5,7 +5,6 @@
       <ITEM DT="2018-12-05T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680005850010</GTIN>
-        <PHAR>1770177</PHAR>
         <SWMC_AUTHNR>00585001</SWMC_AUTHNR>
         <NAME_DE>VARILRIX Trockensub c Solv Fertspr 0.5 ml</NAME_DE>
         <NAME_FR>VARILRIX subst sèche c solv ser pré 0.5 ml</NAME_FR>
@@ -16,7 +15,6 @@
       <ITEM DT="2017-12-14T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680545340019</GTIN>
-        <PHAR>6749124</PHAR>
         <SWMC_AUTHNR>54534001</SWMC_AUTHNR>
         <NAME_DE>TEBOKAN Filmtabl 240 mg 30 Stk</NAME_DE>
         <NAME_FR>TEBOKAN cpr pell 240 mg 30 pce</NAME_FR>
@@ -27,7 +25,6 @@
       <ITEM DT="2017-12-14T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680540150118</GTIN>
-        <PHAR>1882189</PHAR>
         <SWMC_AUTHNR>54015011</SWMC_AUTHNR>
         <NAME_DE>NAROPIN Inj Lös 0.2 % 10ml Duofit Amp 5 Stk</NAME_DE>
         <NAME_FR>NAROPIN sol inj 0.2 % 10ml amp duofit 5 pce</NAME_FR>
@@ -38,7 +35,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680563520172</GTIN>
-        <PHAR>6477223</PHAR>
         <SWMC_AUTHNR>56352017</SWMC_AUTHNR>
         <NAME_DE>ADVATE Trockensub 250 IE c Solv 2 ml Durchstf</NAME_DE>
         <NAME_FR>ADVATE subst sèche 250 UI c solv 2 ml flac</NAME_FR>
@@ -49,7 +45,6 @@
       <ITEM DT="2018-09-20T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680658560014</GTIN>
-        <PHAR>7199565</PHAR>
         <SWMC_AUTHNR>65856001</SWMC_AUTHNR>
         <NAME_DE>DIBASE Tropfen 10000 IE/ml Fl 10 ml</NAME_DE>
         <NAME_FR>DIBASE gouttes 10000 UI/ml fl 10 ml</NAME_FR>
@@ -60,7 +55,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680555580054</GTIN>
-        <PHAR>2465312</PHAR>
         <SWMC_AUTHNR>55558005</SWMC_AUTHNR>
         <NAME_DE>ZYVOXID Filmtabl 600 mg 10 Stk</NAME_DE>
         <NAME_FR>ZYVOXID cpr pell 600 mg 10 pce</NAME_FR>
@@ -71,7 +65,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680620690084</GTIN>
-        <PHAR>5819012</PHAR>
         <SWMC_AUTHNR>62069008</SWMC_AUTHNR>
         <NAME_DE>LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk</NAME_DE>
         <NAME_FR>LEVETIRACETAM DESITIN mini cpr pel 250 mg 30 pce</NAME_FR>
@@ -82,7 +75,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680353660163</GTIN>
-        <PHAR>0020273</PHAR>
         <SWMC_AUTHNR>35366016</SWMC_AUTHNR>
         <NAME_DE>KENDURAL Depottabl 30 Stk</NAME_DE>
         <NAME_FR>KENDURAL cpr dépôt 30 pce</NAME_FR>
@@ -93,7 +85,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680536620137</GTIN>
-        <PHAR>1699947</PHAR>
         <SWMC_AUTHNR>53662013</SWMC_AUTHNR>
         <NAME_DE>3TC Filmtabl 150 mg 60 Stk</NAME_DE>
         <NAME_FR>3TC cpr pell 150 mg 60 pce</NAME_FR>
@@ -104,7 +95,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680161050583</GTIN>
-        <PHAR>2731179</PHAR>
         <SWMC_AUTHNR>16105058</SWMC_AUTHNR>
         <NAME_DE>HIRUDOID Creme 3 mg/g 40 g</NAME_DE>
         <NAME_FR>HIRUDOID crème 3 mg/g 40 g</NAME_FR>
@@ -115,7 +105,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680324750190</GTIN>
-        <PHAR>0023722</PHAR>
         <SWMC_AUTHNR>32475019</SWMC_AUTHNR>
         <NAME_DE>LANSOYL Gel 225 g</NAME_DE>
         <NAME_FR>LANSOYL gel 225 g</NAME_FR>
@@ -126,7 +115,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680573230016</GTIN>
-        <PHAR>6824802</PHAR>
         <SWMC_AUTHNR>57323001</SWMC_AUTHNR>
         <NAME_DE>LANSOPRAZOL Mepha Kaps 15 mg Fl 60 Stk</NAME_DE>
         <NAME_FR>LANSOPRAZOL Mepha caps 15 mg fl 60 pce</NAME_FR>
@@ -137,7 +125,6 @@
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680532900196</GTIN>
-        <PHAR>1699999</PHAR>
         <SWMC_AUTHNR>53290019</SWMC_AUTHNR>
         <NAME_DE>HUMALOG Inj Lös 100 IE/ml Durchstf 10 ml</NAME_DE>
         <NAME_FR>HUMALOG sol inj 100 UI/ml flac 10 ml</NAME_FR>
@@ -148,7 +135,6 @@
       <ITEM DT="2017-12-01T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680002770014</GTIN>
-        <PHAR>0361815</PHAR>
         <SWMC_AUTHNR>00277001</SWMC_AUTHNR>
         <NAME_DE>SEROCYTOL Herz-Gefässe Supp 3 Stk</NAME_DE>
         <NAME_FR>SEROCYTOL Coeur-Vaisseaux supp 3 pce</NAME_FR>
@@ -159,7 +145,6 @@
       <ITEM DT="2017-12-01T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680002780013</GTIN>
-        <PHAR>0361821</PHAR>
         <SWMC_AUTHNR>00278001</SWMC_AUTHNR>
         <NAME_DE>SEROCYTOL Kolon Supp 3 Stk</NAME_DE>
         <NAME_FR>SEROCYTOL Côlon supp 3 pce</NAME_FR>
@@ -170,7 +155,6 @@
       <ITEM DT="2017-12-01T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680406620144</GTIN>
-        <PHAR>0769841</PHAR>
         <SWMC_AUTHNR>40662014</SWMC_AUTHNR>
         <NAME_DE>PEVISONE Creme 15 g</NAME_DE>
         <NAME_FR>PEVISONE crème 15 g</NAME_FR>
@@ -181,7 +165,6 @@
       <ITEM DT="2017-12-01T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680406620229</GTIN>
-        <PHAR>0863244</PHAR>
         <SWMC_AUTHNR>40662022</SWMC_AUTHNR>
         <NAME_DE>PEVISONE Creme 30 g</NAME_DE>
         <NAME_FR>PEVISONE crème 30 g</NAME_FR>
@@ -192,7 +175,6 @@
       <ITEM DT="2017-11-03T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680587340015</GTIN>
-        <PHAR>4153628</PHAR>
         <SWMC_AUTHNR>58734001</SWMC_AUTHNR>
         <NAME_DE>YONDELIS Trockensub 0.25 mg Durchstf</NAME_DE>
         <NAME_FR>YONDELIS subst sèche 0.25 mg flac</NAME_FR>
@@ -203,7 +185,6 @@
       <ITEM DT="2017-11-03T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680627160016</GTIN>
-        <PHAR>5301924</PHAR>
         <SWMC_AUTHNR>62716001</SWMC_AUTHNR>
         <NAME_DE>COOP VITALITY Bronchialpastillen 40 Stk</NAME_DE>
         <NAME_FR>COOP VITALITY pastilles bronchiques 40 pce</NAME_FR>
@@ -214,7 +195,6 @@
       <ITEM DT="2018-01-30T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680651600014</GTIN>
-        <PHAR>6571270</PHAR>
         <SWMC_AUTHNR>65160001</SWMC_AUTHNR>
         <NAME_DE>LYNPARZA Kaps 50 mg 448 Stk</NAME_DE>
         <NAME_FR>LYNPARZA caps 50 mg 448 pce</NAME_FR>
@@ -225,7 +205,6 @@
       <ITEM DT="2018-02-09T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680316440115</GTIN>
-        <PHAR>0020244</PHAR>
         <SWMC_AUTHNR>31644011</SWMC_AUTHNR>
         <NAME_DE>FERRO-GRADUMET Depottabl 30 Stk</NAME_DE>
         <NAME_FR>FERRO-GRADUMET cpr dépôt 30 pce</NAME_FR>
@@ -236,7 +215,6 @@
       <ITEM DT="2018-03-16T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680581580011</GTIN>
-        <PHAR>3656617</PHAR>
         <SWMC_AUTHNR>58158001</SWMC_AUTHNR>
         <NAME_DE>PRIORIX TETRA Trockensub c Solv Fertspr</NAME_DE>
         <NAME_FR>PRIORIX TETRA subst sèche c solv ser pré</NAME_FR>
@@ -247,7 +225,6 @@
       <ITEM DT="2018-03-23T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680444470107</GTIN>
-        <PHAR>0919766</PHAR>
         <SWMC_AUTHNR>44447010</SWMC_AUTHNR>
         <NAME_DE>LOPRESOR Retard Divitabs 200 mg 14 Stk</NAME_DE>
         <NAME_FR>LOPRESOR Retard Divitabs 200 mg 14 pce</NAME_FR>
@@ -258,7 +235,6 @@
       <ITEM DT="2018-03-23T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680444470299</GTIN>
-        <PHAR>0919772</PHAR>
         <SWMC_AUTHNR>44447029</SWMC_AUTHNR>
         <NAME_DE>LOPRESOR Retard Divitabs 200 mg 56 Stk</NAME_DE>
         <NAME_FR>LOPRESOR Retard Divitabs 200 mg 56 pce</NAME_FR>
@@ -269,7 +245,6 @@
       <ITEM DT="2018-03-23T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680152190687</GTIN>
-        <PHAR>0544042</PHAR>
         <SWMC_AUTHNR>15219068</SWMC_AUTHNR>
         <NAME_DE>ZYMAFLUOR Tabl 0.25 mg Ds 400 Stk</NAME_DE>
         <NAME_FR>ZYMAFLUOR cpr 0.25 mg bte 400 pce</NAME_FR>
@@ -280,7 +255,6 @@
       <ITEM DT="2018-03-23T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680434540995</GTIN>
-        <PHAR>2381532</PHAR>
         <SWMC_AUTHNR>43454099</SWMC_AUTHNR>
         <NAME_DE>KAMILLIN Medipharm Bad liq 10 Btl 40 ml</NAME_DE>
         <NAME_FR>KAMILLIN Medipharm bain liq 10 sach 40 ml</NAME_FR>

data/spec/extractor_spec.rb

@@ -51,7 +51,7 @@ end unless SkipMigelDownloader
 describe Oddb2xml::RefdataExtractor do
   before(:all) { common_before }
   after(:all) { common_after }
-  @@last_change = '2015-11-24 00:00:00 +0000'
+  Last_change = '2015-11-24 00:00:00 +0000'
 
   context 'should handle pharma articles' do
     subject do
@@ -60,17 +60,15 @@ describe Oddb2xml::RefdataExtractor do
       @pharma_items = Oddb2xml::RefdataExtractor.new(xml, 'PHARMA').to_hash
     end
 
-    it "should have correct info for pharmacode 1699947 correctly" do
+    it "should have correct info for no8 62069008 correctly" do
       @pharma_items = subject.to_hash
-      pharma_code_LEVETIRACETAM = '5819012'
-      item_found = @pharma_items.values.find{ |x| x[:pharmacode].eql?(pharma_code_LEVETIRACETAM)}
+      item_found = @pharma_items.values.find{ |x| x[:ean13].eql?(Oddb2xml::LEVETIRACETAM_GTIN)}
       expect(item_found).not_to be nil
       expected = {:data_origin=>"refdata",
         :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",
         :desc_fr=>"LEVETIRACETAM DESITIN mini cpr pel 250 mg 30 pce",
@@ -90,15 +88,13 @@ describe Oddb2xml::RefdataExtractor do
 
     it "should have correct info for nonpharma with pharmacode 0058502 correctly" do
       @non_pharma_items = subject.to_hash
-      pharma_code_TUBEGAZE = '0058519'
-      item_found = @non_pharma_items.values.find{ |x| x[:pharmacode].eql?(pharma_code_TUBEGAZE)}
+      item_found = @non_pharma_items.values.find{ |x| x[:ean13].eql?('7611600441020')}
       expect(item_found).not_to be nil
       expected = {:refdata=>true,
       :_type=>:nonpharma,
       :ean13=>'7611600441020',
       :no8 => nil,
-      :pharmacode=>pharma_code_TUBEGAZE,
-      :last_change => @@last_change,
+      :last_change => Last_change,
       :data_origin => "refdata",
       :desc_de=>"TUBEGAZE Verband weiss Nr 12 20m Finger gross",
       :desc_fr=>"TUBEGAZE pans tubul blanc Nr 12 20m doigts grands",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -234,6 +234,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -355,9 +383,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Elexis_Artikelstamm_v003.xsd
 - Elexis_Artikelstamm_v5.xsd
 - Gemfile
@@ -486,7 +514,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.

data/.travis.yml

@@ -1,29 +0,0 @@
-language: ruby
-
-bundler_args: --without debugger
-
-cache: bundler
-sudo: false
-
-before_install:
-  - gem --version
-
-script: bundle exec rspec
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
-notifications:
-  email:
-    recipients:
-      - ngiger@ywesee.com
-      - yasaka@ywesee.com
-      - zdavatz@ywesee.com