oddb2xml 2.6.6 → 2.7.1

data/lib/oddb2xml/util.rb

@@ -7,6 +7,14 @@ module Oddb2xml
   def Oddb2xml.gen_prodno(iksnr, seqnr)
      sprintf('%05d',iksnr) + sprintf('%02d', seqnr)
   end
+  def Oddb2xml.uri_open(url)
+    version = RUBY_VERSION.split('.').map { |x| x.to_i }
+    if (version <=> [2,5,0]) >= 0
+      URI.open(url)
+    else
+      open(url)
+    end
+  end
   def Oddb2xml.calc_checksum(str)
     str = str.strip
     sum = 0
@@ -34,7 +42,7 @@ module Oddb2xml
     end
     Oddb2xml.patch_some_utf8(german).gsub('<br>',"\n")
   end
-  
+
   def Oddb2xml.patch_some_utf8(line)
     begin
       line = line.encode('utf-8')
@@ -61,7 +69,7 @@ module Oddb2xml
   def Oddb2xml.add_epha_changes_for_ATC(iksnr, atc_code, force_run: false)
     @atc_csv_content  =  {} if force_run
     if @atc_csv_content.size == 0
-      open(@atc_csv_origin).readlines.each{
+      Oddb2xml.uri_open(@atc_csv_origin).readlines.each{
         |line|
           items = line.split(',')
           @atc_csv_content[[items[0], items[1]]] = items[2]
@@ -86,7 +94,7 @@ module Oddb2xml
   def Oddb2xml.skip_download?
     @options[:skip_download]
   end
-  
+
   def Oddb2xml.skip_download(file)
     return false if defined?(VCR)
     dest = "#{Downloads}/#{File.basename(file)}"
@@ -96,7 +104,7 @@ module Oddb2xml
     end
     false
   end
-  
+
   def Oddb2xml.download_finished(file, remove_file = true)
     src  = "#{WorkDir}/#{File.basename(file)}"
     dest = "#{Downloads}/#{File.basename(file)}"
@@ -183,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
@@ -232,7 +242,7 @@ COLUMNS_FEBRUARY_2019= {
   @@ean13_to_no8 = {}
     def Oddb2xml.setEan13forProdno(prodno, ean13)
       if ean13.to_i == 7680006660045  ||  ean13.to_i == 7680006660014
-        puts "setEan13forProdno #{prodno} ean13 #{ean13}"
+        Oddb2xml.log "setEan13forProdno #{prodno} ean13 #{ean13}"
       end
       @@prodno_to_ean13[prodno] ||= []
       @@prodno_to_ean13[prodno] << ean13
@@ -240,13 +250,13 @@ COLUMNS_FEBRUARY_2019= {
     end
     def Oddb2xml.setEan13forNo8(no8, ean13)
       if ean13.to_i == 7680006660045  ||  ean13.to_i == 7680006660014
-        puts "setEan13forNo8 #{no8} ean13 #{ean13}"
+        Oddb2xml.log "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}"
+        Oddb2xml.log "@@no8_to_ean13[no8] #{@@no8_to_ean13[no8]} not overridden by #{ean13}"
       end
     end
     def Oddb2xml.getEan13forProdno(prodno)

data/lib/oddb2xml/version.rb

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

data/oddb2xml.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.2.0"
 
   # We fix the version of the spec to newer versions only in the third position
   # hoping that these version fix only security/severe bugs
@@ -36,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
@@ -184,7 +177,7 @@ describe Oddb2xml::Builder do
       @inhalt = IO.read(@artikelstamm_name)
       expect(@inhalt.index('BIOMARIS Voll Meersalz 500 g')).not_to be nil
     end
-    
+
     it 'Should not contain PHAR 8809544 Sildenavil with pexf and ppub 0.0' do
 #1128809544Sildenafil Suspension 7mg/ml 100ml                0030850045801000000000000000000000002
       @inhalt = IO.read(@artikelstamm_name)
@@ -211,12 +204,10 @@ describe Oddb2xml::Builder do
     it 'shoud contain GENERIC_TYPE' do
       expect(@inhalt.index('<GENERIC_TYPE')).not_to be nil
     end
-    
+
     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>
@@ -237,7 +228,7 @@ describe Oddb2xml::Builder do
         </ITEM)
       expect(@inhalt.index(expected)).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
@@ -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>
@@ -349,10 +335,9 @@ describe Oddb2xml::Builder do
             <SL_ENTRY>true</SL_ENTRY>
             <IKSCAT>D</IKSCAT>
             <DEDUCTIBLE>10</DEDUCTIBLE>
-        </ITEM>), 
+        </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>
@@ -391,7 +375,7 @@ describe Oddb2xml::Builder do
             <DOSAGE_FORMF>Compresse</DOSAGE_FORMF>
             <IKSCAT>C</IKSCAT>
             <PRODNO>3164402</PRODNO>
-        </ITEM>), 
+        </ITEM>),
       'product 3TC Filmtabl' => %(<PRODUCT>
             <PRODNO>5366201</PRODNO>
             <SALECD>A</SALECD>
@@ -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>
@@ -439,20 +421,37 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>20</DEDUCTIBLE>
             <PRODNO>5329001</PRODNO>
         </ITEM>),
-        'Chapter 70 limitation' => %(<LIMITATION>
-            <!--Chapter70 hack-->
-            <LIMNAMEBAG>L1, L2</LIMNAMEBAG>
-            <DSCR>Eine Flasche zu 20 ml Urtinktur einer bestimmten Pflanze pro Monat. Für Aesculus, Carduus Marianus, Ginkgo, Hedera helix, Hypericum perforatum, Lavandula, Rosmarinus officinalis, Taraxacum officinale.</DSCR>
-            <DSCRF/>
-            <LIMITATION_PTS>1</LIMITATION_PTS>
-        </LIMITATION>),
+        'Varilrix product' => %(<PRODUCT>
+            <PRODNO>0058501</PRODNO>
+            <SALECD>A</SALECD>
+            <DSCR>Varilrix Trockensub c solv</DSCR>
+            <DSCRF>Varilrix subst sèche c solv</DSCRF>
+            <ATC>J07BK01</ATC>
+            <LIMNAMEBAG>0808</LIMNAMEBAG>
+            <SUBSTANCE>Vaccinum virus varicellae vivus attenuat. (Stamm OKA)</SUBSTANCE>
+        </PRODUCT>),
+        'Varilrix item' => %(<ITEM PHARMATYPE="P">
+            <GTIN>7680005850010</GTIN>
+            <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>
+            <COMP>
+                <NAME>GlaxoSmithKline AG</NAME>
+                <GLN>7601001000674</GLN>
+            </COMP>
+            <PEXF>43.64</PEXF>
+            <PPUB>66.5</PPUB>
+            <SL_ENTRY>true</SL_ENTRY>
+            <IKSCAT>B</IKSCAT>
+            <DEDUCTIBLE>10</DEDUCTIBLE>
+            <PRODNO>0058501</PRODNO>
+        </ITEM),
         'Chapter 70 product' => %(<PRODUCT>
             <PRODNO>2069639</PRODNO>
-            <!--Chapter70 hack-->
+            <!--Chapter70 hack prodno 2069639 Ceres Urtinkturen gemäss L2 mit - im Kommentar-->
             <SALECD>A</SALECD>
-            <DSCR>Ceres Urtinkturen gemäss L2</DSCR>
+            <DSCR>Ceres Urtinkturen gemäss L2 mit -- im Kommentar</DSCR>
             <DSCRF/>
-            <LIMNAMEBAG>L1, L2</LIMNAMEBAG>
         </PRODUCT>),
         'Chapter 70 item' => %(<ITEM PHARMATYPE="P">
             <GTIN>2500000588532</GTIN>
@@ -462,7 +461,7 @@ describe Oddb2xml::Builder do
             <DSCRF>--missing--</DSCRF>
             <PEXF>23.44</PEXF>
             <PPUB>31.30</PPUB>
-            <!--Chapter70 hack-->
+            <!--Chapter70 hack 2500000588532 EINF ARZNEI Ceres Urtinktur spez 20ml-->
             <SL_ENTRY>true</SL_ENTRY>
             <PRODNO>2069639</PRODNO>
         </ITEM>),

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>
@@ -59,7 +58,7 @@ ARTICLE_NAROPIN = %(<REF_DATA>1</REF_DATA>
       <BCSTAT>A</BCSTAT>
     </ARTBAR>
   </ART>)
-  
+
 ARTICLE_COMMON_ELEMENTS =    [
   ['ARTICLE/ART/REF_DATA', '1'],
   ['ARTICLE/ART/SMCAT', 'A'],
@@ -256,17 +255,7 @@ def check_result(inhalt, nbr_record)
   expect(inhalt.index('<ERROR_CODE/>')).to be > 0
   m = /<NBR_RECORD>(\d+)<\/NBR_RECORD>/.match(inhalt)
   expect(m).not_to be nil
-  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
+  expect(m[1].to_i).to eq  nbr_record
 end
 
 ['article', 'betrieb', 'code', 'interaction', 'limitation', 'medizinalperson', 'product', 'substance'].each do |cat|
@@ -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,16 +462,16 @@ def checkProductXml(nbr_record = -1)
 end
 
 describe Oddb2xml::Builder do
-  NrExtendedArticles = 76
-  NrSubstances = 27
-  NrLimitations = 14
-  
+  NrExtendedArticles = 80
+  NrSubstances = 28
+  NrLimitations = 15
+
   NrInteractions = 2
   NrCodes = 5
   NrProdno = 31
-  NrPackages = 44
-  NrProducts = 39
-  RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
+  NrPackages = 46
+  NrProducts = 40
+  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
@@ -532,7 +526,7 @@ describe Oddb2xml::Builder do
 
     check_attributes(oddb_article_xml, ARTICLE_ATTRIBUTE_TESTS)
     check_elements(oddb_article_xml, ARTICLE_COMMON_ELEMENTS)
-    
+
     it 'should validate XSD article' do
       @inhalt = File.read(oddb_article_xml)
       # This fails on Ruby < 2.4 as NAROPIN INJ LÖS 0.2 % 10 is wrongly encoded
@@ -552,7 +546,7 @@ describe Oddb2xml::Builder do
     end
 
     it 'should have a correct insulin (gentechnik) for 7680532900196' do
-      expect(XPath.match( @rexml, "//ART/[BC='7680532900196']").size).to eq 1
+      expect(@inhalt.match(/.*<BC>7680532900196<\/BC>.*/).class).to be MatchData
       expect(XPath.match( @rexml, "//ART//GEN_PRODUCTION").size).to be >= 1
       expect(XPath.match( @rexml, "//ART//GEN_PRODUCTION").first.text).to eq 'X'
       expect(XPath.match( @rexml, "//ART//INSULIN_CATEGORY").size).to eq 1
@@ -568,7 +562,7 @@ describe Oddb2xml::Builder do
     ean_with_drug_index = 7680555610041
     it "should have a correct drug information for #{ean_with_drug_index}" do
       doc = REXML::Document.new IO.read(checkAndGetArticleXmlName)
-      expect(XPath.match( @rexml, "//ART/[BC='#{ean_with_drug_index}']").size).to eq 1
+      expect(@inhalt.match(/.*<BC>#{ean_with_drug_index}<\/BC>.*/).class).to be MatchData
       expect(XPath.match( @rexml, "//ART//DRUG_INDEX").size).to eq 1
       expect(XPath.match( @rexml, "//ART//DRUG_INDEX").first.text).to eq 'd'
       found = false
@@ -605,11 +599,11 @@ describe Oddb2xml::Builder do
     <CPT/>)
       expect(oddb_product_xml.index(text2)).to be >= 1
     end
-    
+
     it 'should generate SALECD A for swissmedic packages' do
       expect(IO.read(oddb_article_xml).index('<SALECD>A<!--Overriding status I nincd 10 for 7680658560014 as in refdata_pharma--></SALECD>')).to be >= 1
     end
-    
+
   end
 
   context 'when -o for fachinfo is given' do
@@ -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