oddb2xml 2.6.2 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06c2d44fbe8f0bf48806bf8d38b6a7d15c84b948
-  data.tar.gz: f10d3c2ffc00d2c005756851e24c64b3bd61aeac
+SHA256:
+  metadata.gz: 070625b76250b6816b761d5e4f37474326218067dcdbd0a59824c2667e62e9b7
+  data.tar.gz: 04af7deafbe8160ad3283b6edb9bae596d9782bad4c7a4be8facda175f062ac8
 SHA512:
-  metadata.gz: 9c38d2c021f76e7e159395f81aa31d8ea33d50df2b157edee9eed96d8e66f2e13c887cf17b7707a7c899bffee5c8ec090993786acbbeedf4893cc65ee19ef42a
-  data.tar.gz: 0dfd82ddc901609d2531bc61e1641d7ac600f3fe5699e22af97be8a924bb4cdae8d9bfe9cb1ba5813ee3e528569e5176f2531b40c0b8dd21d84ceb9c7dc86e8d
+  metadata.gz: 3616fc763495253e24a1176ccd5d2907e08b96860e87d79c5577b14b38826bf57aaa3aebbf7777fcde28cb2d243b379e25697ba943b1df921ea6cbe6ea16edca
+  data.tar.gz: dba061cc87bd89396f38b792f51c9918a23f55d9452c9df9472b5a1e208859f729cbba868097763fc0364791fbb0900a6df97319525dc9721515ad921527c18c

data/.travis.yml

@@ -11,17 +11,16 @@ before_install:
 script: bundle exec rspec
 
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - 2.5.0
+  # Building on Versions 2.4 or earlier of Ruby fail, because URI.open was priveate
+  # - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.2.7
-    - rvm: 2.3.4
 
 notifications:
   email:

data/Elexis_Artikelstamm_v5.xsd

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2016 MEDEVIT. All rights reserved. This program and the 
-	accompanying materials are made available under the terms of the Eclipse 
-	Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html v002 - Ergänzung K Komplementärprodukt 
-	bei generic type, Consider ATC code of length 8 (on vet.med. articles) Relax 
-	ADDSCR occurence to 0 .. 1 v003 - PRODNO hinzugefügt LIMNAMEBAG zur formal-kennzeichnung 
-	von identen limitations v4 - Major refactoring, see https://redmine.medelexis.ch/issues/4405 
+<!-- Copyright (c) 2016 MEDEVIT. All rights reserved. This program and the
+	accompanying materials are made available under the terms of the Eclipse
+	Public License v1.0 which accompanies this distribution, and is available
+	at http://www.eclipse.org/legal/epl-v10.html v002 - Ergänzung K Komplementärprodukt
+	bei generic type, Consider ATC code of length 8 (on vet.med. articles) Relax
+	ADDSCR occurence to 0 .. 1 v003 - PRODNO hinzugefügt LIMNAMEBAG zur formal-kennzeichnung
+	von identen limitations v4 - Major refactoring, see https://redmine.medelexis.ch/issues/4405
 	Contributors: MEDEVIT <office@medevit.at> - initial API and implementation -->
 <xs:schema targetNamespace="http://elexis.ch/Elexis_Artikelstamm_v5"
 	elementFormDefault="qualified" attributeFormDefault="unqualified"
@@ -339,7 +339,6 @@
 										</xs:element>
 										<xs:element name="GENERIC_TYPE"
 											maxOccurs="1" minOccurs="0">
-
 											<xs:simpleType>
 												<xs:annotation>
 													<xs:documentation>
@@ -359,6 +358,9 @@
 													<xs:enumeration
 														value="K">
 													</xs:enumeration>
+													<xs:enumeration
+                            value="C"> <!-- BAG 9.6.2020: BDer Buchstabe C bei «Original Generika Code» steht für Co-Marketing Arzneimittel -->
+													</xs:enumeration>
 												</xs:restriction>
 											</xs:simpleType>
 										</xs:element>
@@ -429,6 +431,9 @@
 												</xs:documentation>
 											</xs:annotation>
 										</xs:element>
+										<xs:element name="Chapter70_HACK"
+											type="xs:string" minOccurs="0" maxOccurs="1">
+										</xs:element>
 									</xs:sequence>
 
 

data/History.txt

@@ -1,3 +1,24 @@
+=== 2.6.7 / 25.06.2020
+* Added value 'C' (Co-marketing) for field GENERIC_TYPE Elexis_Artikelstamm_v5.xsd from BAG Preparations.xml
+* Fixed limitations coming from the chapte 70 hack
+* Ruby 2.7 compatible (No URI.open warning)
+
+=== 2.6.6 / 11.01.2020
+* Fix link for varia_De.htm
+
+=== 2.6.5 / 11.01.2020
+* Fix issue #37: Update BAG Download Link
+** Pending problem: varia_De.htm for Artikelstamm cannot be found anymore
+
+=== 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
+
+=== 2.6.2 / 01.07.2019
+* Use https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/interactions_de_utf8.csv instead of https://download.epha.ch/cleaned/matrix.csv
+
 === 2.6.1 / 27.02.2019
 * Update rubyXL to 3.4.0 with fix to avoid problem reported via https://github.com/weshatheleopard/rubyXL/issues/325
 * When generating artikelstamm XML generate products (aka sequences) with name like "3TC Filmtabl 150 mg" instead of only "3TC"
@@ -114,7 +135,7 @@
 
 === 2.4.1 / 2.12.2016
 
-* Update oddb2xml.gemspec to add GPL-3.0 as correct license for Rubygems as stated in LICENSE file 
+* Update oddb2xml.gemspec to add GPL-3.0 as correct license for Rubygems as stated in LICENSE file
 * Added a hack for 24 globulina equina which commas between brackets
 
 === 2.4.0 /25.08.2016
@@ -552,7 +573,7 @@
 
 * Improve NINCD detection
   - Update timeout handling
-  - Improve pharmacode detection                
+  - Improve pharmacode detection
 
 === 1.5.1 / 10.06.2013
 

data/README.md

@@ -273,7 +273,7 @@ product.xml has relation to substance as ``.
 We use the following files:
 
 * https://www.swissmedic.ch/arzneimittel/00156/00221/00222/00230/index.html?lang=de (Präparateliste und zugelassene Packungen)
-* https://download.epha.ch/cleaned/matrix.csv (Interactions from epha)
+* https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/interactions_de_utf8.csv
 * http://refdatabase.refdata.ch/Service/Article.asmx
 * http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip
 * https://www.medregbm.admin.ch/Publikation/CreateExcelListBetriebs

data/bin/check_artikelstamm

@@ -16,7 +16,7 @@ require 'optimist'
   #{File.basename(__FILE__)} xml_file_to_check
 EOS
 end
-$stdout.sync = false
+$stdout.sync = true
 
 args = ARGV
 if args.size != 1

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,19 +1558,19 @@ 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' : '',
                               ]
               end
             end
           else # non pharma
-             @csv_file << [ ean13, (obj[:desc_de] || obj[:description]), '', '',
-                          obj[:price], obj[:pub_price], '', '', '', '', '', '' ]
             if @@emitted_v5_gtins.index(ean13)
               next
             else
@@ -1589,17 +1589,38 @@ module Oddb2xml
               xml.GTIN ean13.to_s.rjust(13, '0')
               xml.PHAR obj[:pharmacode]
               emit_salecd(xml, ean13, obj)
-              xml.DSCR(obj[:desc_de] || obj[:description]) # for description for zur_rose
+              description = obj[:desc_de] || obj[:description] # for description for zur_rose
+              xml.DSCR(description)
               xml.DSCRF(obj[:desc_fr] || '--missing--')
               xml.COMP  do
                 xml.GLN obj[:company_ean]
               end if obj[:company_ean] && !obj[:company_ean].empty?
-              xml.PEXF obj[:price]      if obj[:price] && !obj[:price].empty?
-              xml.PPUB obj[:pub_price]  if obj[:pub_price] && !obj[:pub_price].empty?
+              if !(obj[:price] && !obj[:price].empty?) || !(obj[:pub_price] && !obj[:pub_price].empty?)
+                zur_rose_detail = @infos_zur_rose.values.find{|x| x[:ean13].to_i == ean13.to_i}
+              end
+              ppub = nil; pexf=nil
+              if obj[:price] && !obj[:price].empty?
+                xml.PEXF (pexf = obj[:price])
+              elsif zur_rose_detail
+                if zur_rose_detail[:price] && !zur_rose_detail[:price].empty? && !zur_rose_detail[:price].eql?('0.00')
+                  Oddb2xml.log "NonPharma: #{ean13} adding PEXF #{zur_rose_detail[:price]} #{description}"
+                  xml.PEXF (pexf = zur_rose_detail[:price])
+                end
+              end
+              if obj[:pub_price] && !obj[:pub_price].empty?
+                xml.PPUB  (ppub = obj[:pub_price])
+              elsif zur_rose_detail
+                if zur_rose_detail[:pub_price] && !zur_rose_detail[:pub_price].empty? && !zur_rose_detail[:pub_price].eql?('0.00')
+                  Oddb2xml.log "NonPharma: #{ean13} adding PPUB #{zur_rose_detail[:pub_price]} #{description}"
+                  xml.PPUB (ppub = zur_rose_detail[:pub_price])
+                end
+              end
+             @csv_file << [ ean13, description, '', '', pexf, ppub, '', '', '', '', '', '' ]
               if chap70
-                xml.comment "Chapter70 hack" 
+                xml.comment "Chapter70 hack"
                 xml.SL_ENTRY 'true'
                 xml.PRODNO obj[:pharmacode]
+                xml.Chapter70_HACK 'true'
               end
             end
           end
@@ -1658,18 +1679,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} #{myPack[:sequence_name]}"
+              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
@@ -1699,12 +1722,14 @@ module Oddb2xml
                   used_limitations << lim_code unless used_limitations.index(lim_code)
                   xml.LIMNAMEBAG lim_code
                 elsif obj[:chapter70]
-                  used_limitations << obj[:code]
                   xml.comment "Chapter70 hack"
                   xml.SALECD('A') # these products are always active!
                   xml.DSCR obj[:description]
                   xml.DSCRF ''
-                  xml.LIMNAMEBAG obj[:code]
+                  if @limitations.index(obj[:code])
+                    xml.LIMNAMEBAG obj[:code]
+                    used_limitations << obj[:code]
+                  end
                 end
                 if sequence && sequence[:substances]
                   value = nil

data/lib/oddb2xml/chapter_70_hack.rb

@@ -12,7 +12,7 @@ module Oddb2xml
         puts "parse_td returns: #{res}" if $VERBOSE
       rescue => exc
         puts "Unable to pars #{elem} #{exc}"
-        binding.pry
+        # binding.pry
         return nil
       end
       res.flatten # .join("\t")
@@ -26,14 +26,14 @@ module Oddb2xml
     def self.items
       @@items
     end
-    def self.parse(html_file = 'http://bag.e-mediat.net/Sl2007.web.external/varia_De.htm')
+    def self.parse(html_file = 'http://www.spezialitaetenliste.ch/varia_De.htm')
       data = Hash.new{|h,k| h[k] = [] }
       Ox.default_options = {
           mode:   :generic,
           effort: :tolerant,
           smart:  true
       }
-      res = Ox.load(open(html_file).read, mode: :hash_no_attrs).values.first['body']
+      res = Ox.load(URI.open(html_file).read, mode: :hash_no_attrs).values.first['body']
       result = []
       idx = 0
       @@items = {}
@@ -50,15 +50,16 @@ module Oddb2xml
         data = {}
         pharma_code = entry.first
         ean13 =  (Oddb2xml::FAKE_GTIN_START + pharma_code.to_s)
-        german = entry[2].force_encoding('ISO-8859-1').encode('UTF-8')
-        while !german.eql?(HTMLEntities.new.decode(german))
-          german = HTMLEntities.new.decode(german)
+        if entry[2].encoding.to_s.eql?('ASCII-8BIT')
+          german = CGI.unescape(entry[2].force_encoding('ISO-8859-1'))
+        else
+          german = entry[2]
         end
         @@items[ean13] = {
           :data_origin   => 'Chapter70',
           :line   => entry.join(","),
           :ean13 => ean13,
-          :description => Oddb2xml.html_decode(entry[2]),
+          :description => german,
           :quantity => entry[3],
           :pharmacode => pharma_code,
           :pub_price => entry[4],
@@ -70,5 +71,3 @@ module Oddb2xml
     end
   end
 end
-
-  

data/lib/oddb2xml/downloader.rb

@@ -23,7 +23,7 @@ module Oddb2xml
       else
         begin
           io = File.open(file, option)
-          data = open(@url).read
+          data = URI.open(@url).read
           io.write(data)
         rescue => error
           puts "error #{error} while fetching #{@url}"
@@ -197,7 +197,7 @@ module Oddb2xml
     include DownloadMethod
     def init
       super
-      @url ||= 'http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip'
+      @url ||= 'http://www.xn--spezialittenliste-yqb.ch/File.axd?file=XMLPublications.zip'
     end
     def download
       file = File.join(WorkDir, 'XMLPublications.zip')
@@ -283,7 +283,7 @@ module Oddb2xml
     include DownloadMethod
     def initialize(type=:orphan, options = {})
       url = BASE_URL + '/swissmedic/de/home/services/listen_neu.html'
-      doc = Nokogiri::HTML(open(url))
+      doc = Nokogiri::HTML(URI.open(url))
       @type = type
       @options = options
       case @type

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/semantic_check.rb

@@ -64,7 +64,7 @@ module Oddb2xml
         end
       end
     end
-    
+
     def everyPharmaArticleHasAProductItem
       result = true
       puts "#{Time.now.strftime("%H:%M:%S")}: everyPharmaArticleHasAProductItem"
@@ -74,7 +74,7 @@ module Oddb2xml
         unless allProductNumbers.index(item[:PRODNO])
           puts "Item #{item[:GTIN]}  has no Product #{item[:PRODNO]}  #{item[:DSCR]}"
           result = false
-        end
+        end unless item[:Chapter70_HACK]
       end
       result
     end
@@ -91,17 +91,19 @@ module Oddb2xml
       end
       result
     end
-    
+
     def everyReferencedLimitationIsIncluded
+      result = true
       puts "#{Time.now.strftime("%H:%M:%S")}: everyReferencedLimitationIsIncluded"
       allLimitations = limitations.collect{ |lim| lim[:LIMNAMEBAG] }
       products.each do |product|
         next unless product[:LIMNAMEBAG]
         unless allLimitations.index(product[:LIMNAMEBAG])
           puts "product #{product[:PRODNO]}  has no limitation #{product[:LIMNAMEBAG]} #{product[:DSCR]}"
-          return false
+          result = false
         end
       end
+      result
     end
 
     def checkPackageSize

data/lib/oddb2xml/util.rb

@@ -23,7 +23,7 @@ module Oddb2xml
     Downloads     = "#{Dir.pwd}/downloads"
   end
   @options = {}
-  @atc_csv_origin = 'http://download.epha.ch/data/atc/atc.csv'
+  @atc_csv_origin = 'https://github.com/zdavatz/cpp2sqlite/blob/master/input/atc_codes_multi_lingual.txt'
   @atc_csv_content = {}
 
   def Oddb2xml.html_decode(string)
@@ -34,7 +34,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')
@@ -86,7 +86,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 +96,7 @@ module Oddb2xml
     end
     false
   end
-  
+
   def Oddb2xml.download_finished(file, remove_file = true)
     src  = "#{WorkDir}/#{File.basename(file)}"
     dest = "#{Downloads}/#{File.basename(file)}"
@@ -232,7 +232,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 +240,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.2"
+  VERSION = "2.6.7"
 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 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"
@@ -184,7 +184,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,29 +211,33 @@ 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>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
-    
+
     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
@@ -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>
@@ -345,7 +349,7 @@ 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>
@@ -387,7 +391,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>
@@ -435,20 +439,12 @@ 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>),
         'Chapter 70 product' => %(<PRODUCT>
             <PRODNO>2069639</PRODNO>
             <!--Chapter70 hack-->
             <SALECD>A</SALECD>
             <DSCR>Ceres Urtinkturen gemäss L2</DSCR>
             <DSCRF/>
-            <LIMNAMEBAG>L1, L2</LIMNAMEBAG>
         </PRODUCT>),
         'Chapter 70 item' => %(<ITEM PHARMATYPE="P">
             <GTIN>2500000588532</GTIN>
@@ -461,6 +457,7 @@ describe Oddb2xml::Builder do
             <!--Chapter70 hack-->
             <SL_ENTRY>true</SL_ENTRY>
             <PRODNO>2069639</PRODNO>
+            <Chapter70_HACK>true</Chapter70_HACK>
         </ITEM>),
         'HTML-encoded limitation' => %(<DSCR>Zur Erhaltungstherapie (Monotherapie) bei erwachsenen Patientinnen mit rezidiviertem, fortgeschrittenem Ovarialkarzinom mit BRCA Mutation im Anschluss an eine platinhaltige Chemotherapie bei Vorliegen einer kompletten oder partiellen Remission.
 

data/spec/builder_spec.rb

@@ -59,7 +59,7 @@ ARTICLE_NAROPIN = %(1
       <BCSTAT>A</BCSTAT>
     </ARTBAR>
   </ART>)
-  
+
 ARTICLE_COMMON_ELEMENTS =    [
   ['ARTICLE/ART/REF_DATA', '1'],
   ['ARTICLE/ART/SMCAT', 'A'],
@@ -256,7 +256,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 
+  expect(m[1].to_i).to eq  nbr_record
 end
 
 def checkItemForRefdata(doc, pharmacode, isRefdata)
@@ -476,7 +476,7 @@ describe Oddb2xml::Builder do
   NrExtendedArticles = 76
   NrSubstances = 27
   NrLimitations = 14
-  
+
   NrInteractions = 2
   NrCodes = 5
   NrProdno = 31
@@ -532,7 +532,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 +552,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 +568,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 +605,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

data/spec/downloader_spec.rb

@@ -76,7 +76,7 @@ def common_before
   FileUtils.makedirs(Oddb2xml::WorkDir)
   Dir.chdir(Oddb2xml::WorkDir)
   WebMock.enable!
-  { 'https://download.epha.ch/cleaned/matrix.csv' =>  'epha_interactions.csv',
+  { 'https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/interactions_de_utf8.csv' =>  'epha_interactions.csv',
     }.each do |url, file|
     inhalt = File.read(File.join(Oddb2xml::SpecData, file))
     stub_request(:get,url).to_return(body: inhalt)

data/spec/fixtures/vcr_cassettes/oddb2xml.json

@@ -966,7 +966,7 @@
                     ]
                 },
                 "method": "get",
-                "uri": "http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip"
+                "uri": "http://www.xn--spezialittenliste-yqb.ch/File.axd?file=XMLPublications.zip"
             },
             "response": {
                 "body": {
@@ -1025,7 +1025,7 @@
                     ]
                 },
                 "method": "get",
-                "uri": "http://download.epha.ch/data/atc/atc.csv"
+                "uri": "https://github.com/zdavatz/cpp2sqlite/blob/master/input/atc_codes_multi_lingual.txt"
             },
             "response": {
                 "body": {
@@ -1141,7 +1141,7 @@
                     ]
                 },
                 "method": "get",
-                "uri": "https://download.epha.ch/cleaned/matrix.csv"
+                "uri": "https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/interactions_de_utf8.csv"
             },
             "response": {
                 "body": {
@@ -1230,7 +1230,7 @@
                     ]
                 },
                 "method": "get",
-                "uri": "https://download.epha.ch/cleaned/matrix.csv"
+                "uri": "https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/interactions_de_utf8.csv"
             },
             "response": {
                 "body": {

data/spec/spec_helper.rb

@@ -249,15 +249,15 @@ def mock_downloads
         cmd = "zip --quiet --junk-paths #{zip_file} #{files.join(' ')}"
         system(cmd)
     end
-    { 'https://download.epha.ch/cleaned/matrix.csv' =>  'epha_interactions.csv',
+    { 'https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/interactions_de_utf8.csv' =>  'epha_interactions.csv',
       'https://www.swissmedic.ch/swissmedic/de/home/services/listen_neu.html' => 'listen_neu.html',
       'https://www.swissmedic.ch/dam/swissmedic/de/dokumente/internetlisten/status_ophan%20Drug.xlsx.download.xlsx/Liste_OrphanDrug_Internet_2019_01_31.xlsx' =>  'swissmedic_orphan.xlsx',
       'https://www.swissmedic.ch/dam/swissmedic/de/dokumente/internetlisten/zugelassene_packungen_ham.xlsx.download.xlsx/Zugelassene_Packungen%20HAM_31012019.xlsx' => 'swissmedic_package.xlsx',
       'http://pillbox.oddb.org/TRANSFER.ZIP' =>  'transfer.zip',
-      'https://raw.githubusercontent.com/epha/robot/master/data/manual/swissmedic/atc.csv' => 'atc.csv',
+      'https://github.com/zdavatz/cpp2sqlite/blob/master/input/atc_codes_multi_lingual.txt' => 'atc.csv',
       'https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/LPPV.txt' => 'oddb2xml_files_lppv.txt',
-      'http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip' => 'XMLPublications.zip',
-      'http://bag.e-mediat.net/Sl2007.web.external/varia_De.htm' => 'varia_De.htm',
+      'http://www.xn--spezialittenliste-yqb.ch/File.axd?file=XMLPublications.zip' => 'XMLPublications.zip',
+      'http://www.spezialitaetenliste.ch/varia_De.htm' => 'varia_De.htm',
 #      'http://refdatabase.refdata.ch/Service/Article.asmx?WSDL' => 'refdata_Pharma.xml',
       }.each do |url, file|
       inhalt = File.read(File.join(Oddb2xml::SpecData, file))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.7
 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: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -486,8 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.