oddb2xml 2.6.5 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86de903a87776c7969e192656d4ea983cebe62063010aeffb75257820a31685
-  data.tar.gz: 20234d09bd4926b71601b4a2b9b5ee7bc94b1fec8b2c74b8393464be6a1656e5
+  metadata.gz: f09c85343784bea903af64ee40b29749dfdfc2af55000673244129510276c88a
+  data.tar.gz: 7a8cbd05765da37ec1d582c13bb71758c05a0ddd73773aea5084fa211ebf98d2
 SHA512:
-  metadata.gz: a626eb132bd5ea68f98abaed4c2aab207ac7b48ac87629d3b386029db7acf93c5a7fba09ac2ebe8230ca44e5c148f40435168a8bd10f7a7fc4870ce934d28f50
-  data.tar.gz: b2ef4264a9271cac057473955f13d229b24825c5560716aece640a0e6f24c10b1d9a8b6fae5dab7d448237b9fe4976a15100a09121e73d6cb2ca5061253c4cd0
+  metadata.gz: 5be02fa2ec4dff0aa6f8c4a4dbfba9cc0f272831fd0b10b6a1af1a18fd3cff3956ad0884de9e81c19c31d60984cc5d234586372aa7a0d34acdab9015cf7252d8
+  data.tar.gz: ea9317a80ad372959d59f0a13614a9a5a8a1f5da3befa9202f5dadbcb23a41523580184c9a769fb512ba7256f5d36b97dffc214424d4d70df499cb35b6c9371e

data/.travis.yml

@@ -11,17 +11,15 @@ before_install:
 script: bundle exec rspec
 
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - 2.5.0
+  - 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>

data/History.txt

@@ -1,3 +1,26 @@
+=== 2.7.0 / 05.11.2020
+* Chapter70 hack nur als Kommentar
+* Avoid double hyphen in comment
+
+=== 2.6.9 / 29.06.2020
+
+* Fix problem when running bin/oddb2xml -a -f dat. Thanks to Lukas Furre for reporting the problem
+* Fix warning with regular expression thas has ']'
+
+=== 2.6.8 / 26.06.2020
+
+* Re-Add support for Ruby Version 2.4
+* Specified minimal ruby version in gemspec
+* Patch artikelstamm build to emit a product for Varilrix
+
+=== 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
@@ -127,7 +150,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
@@ -565,7 +588,7 @@
 
 * Improve NINCD detection
   - Update timeout handling
-  - Improve pharmacode detection                
+  - Improve pharmacode detection
 
 === 1.5.1 / 10.06.2013
 

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

@@ -1337,7 +1337,7 @@ module Oddb2xml
                                           else
                                             ('0' * DAT_LEN[:ITHE])
                                           end.to_i
-          row << "%0#{DAT_LEN[:CEAN]}d" % (sprintf('%013d', ean).match(/^000000/) ? 0 : ean.to_i)
+          row << "%0#{DAT_LEN[:CEAN]}d" % (sprintf('%013d', ean.to_i).match(/^000000/) ? 0 : ean.to_i)
           row << "%#{DAT_LEN[:CMWS]}s"  % '2' # pharma
           rows << row
       end
@@ -1557,9 +1557,20 @@ module Oddb2xml
                   when 'N'; xml.DEDUCTIBLE 10; # 10%
                 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]
+                unless prodno # find a prodno from packages for vaccinations
+                  if atc && /^J07/.match(atc) && !/^J07AX/.match(atc)
+                    pack = @packs.values.find{ |v| v && v[:atc_code].eql?(atc)}
+                    if pack
+                      prodno = pack[:prodno]
+                      Oddb2xml.log "Patching vaccination for #{pkg_gtin} #{atc} #{name} via prodno #{prodno}"
+                    else
+                      Oddb2xml.log "unable to find a pack/prodno for  vaccination for #{pkg_gtin} #{atc} #{name}"
+                    end
+                  end
+                end
+                xml.PRODNO prodno if prodno
                 csv = []
                 @csv_file << [pkg_gtin, name, package[:unit], measure,
                               pexf ? pexf : '',
@@ -1571,8 +1582,6 @@ module Oddb2xml
               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
@@ -1591,15 +1600,35 @@ 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 #{ean13.to_s.rjust(13, '0')} #{description.encode(:xml => :text).gsub('--','-')}"
                 xml.SL_ENTRY 'true'
                 xml.PRODNO obj[:pharmacode]
               end
@@ -1665,7 +1694,7 @@ module Oddb2xml
               myPack = @packs.values.find{ |x| x[:iksnr].to_i == obj[:seq][:swissmedic_number5].to_i } if  obj[:seq]
               if myPack && !prodno
                 prodno ||= myPack[:prodno]
-                puts "Setting prodno #{prodno} for #{ean13} Varilrix"
+                puts "Setting prodno #{prodno} for #{ean13} #{myPack[:sequence_name]}"
               end
               next unless prodno
               next if emitted_prodno.index(prodno)
@@ -1703,12 +1732,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.comment "Chapter70 hack prodno #{prodno} #{obj[:description].encode(:xml => :text).gsub('--','-')}"
                   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
@@ -1734,7 +1765,7 @@ module Oddb2xml
               end
               emitted_lim_code << lim[:code]
               xml.LIMITATION do
-                xml.comment "Chapter70 hack" if lim[:chap70]
+                xml.comment "Chapter70 2 hack" if lim[:chap70]
                 xml.LIMNAMEBAG lim[:code] # original LIMCD
                 xml.DSCR       Oddb2xml.html_decode(lim[:desc_de])
                 xml.DSCRF      Oddb2xml.html_decode(lim[:desc_fr])

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(Oddb2xml.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/cli.rb

@@ -88,6 +88,7 @@ module Oddb2xml
             puts "Validatied #{@_files[:artikelstamm]}"
          else
             puts "Validating failed using #{cmd}"
+            raise  "Validating failed using #{cmd}"
             exit(2)
          end
       end
@@ -157,7 +158,9 @@ module Oddb2xml
             end
           end
           if @options[:calc]
-            FileUtils.cp(File.join(WorkDir, file), File.join(WorkDir, file.sub('.xml', '_'+Time.now.strftime("%d.%m.%Y_%H.%M")+'.xml')), :verbose => false)
+            ext = File.extname(file)
+            dest = File.join(WorkDir, file.sub(ext, '_'+Time.now.strftime("%d.%m.%Y_%H.%M")+ext))
+            FileUtils.cp(File.join(WorkDir, file), dest, :verbose => false)
           end
         end
       rescue Interrupt

data/lib/oddb2xml/downloader.rb

@@ -23,7 +23,7 @@ module Oddb2xml
       else
         begin
           io = File.open(file, option)
-          data = open(@url).read
+          data = Oddb2xml.uri_open(@url).read
           io.write(data)
         rescue => error
           puts "error #{error} while fetching #{@url}"
@@ -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(Oddb2xml.uri_open(url))
       @type = type
       @options = options
       case @type

data/lib/oddb2xml/parslet_compositions.rb

@@ -88,7 +88,11 @@ module ParseUtil
         composition.substances.each do
           |substance_item|
           active_substance_name = substance_item.name.downcase.sub(/^cum\s/, '')
-          substance_item.is_active_agent = (active_agents.find {|x| /#{x.downcase.gsub('(', '\(').gsub(')', '\)')}($|\s)/.match(active_substance_name) } != nil)
+          substance_item.is_active_agent = (active_agents.find {|x| /#{x.downcase.
+                                                                gsub('(', '\(').
+                                                                gsub(')', '\)').
+                                                                gsub('[', '\[').
+                                                                gsub(']', '\]')}($|\s)/.match(active_substance_name) } != nil)
           substance_item.is_active_agent = true if substance_item.chemical_substance and active_agents.find {|x| x.downcase.eql?(substance_item.chemical_substance.name.downcase) }
          end
         comps << composition

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

@@ -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)}"
@@ -232,7 +240,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 +248,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.5"
+  VERSION = "2.7.0"
 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

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 = {})
@@ -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,7 +211,7 @@ 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>
@@ -237,7 +237,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
@@ -349,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>
@@ -391,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>
@@ -439,20 +439,38 @@ 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>
+            <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>
+            <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 +480,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

@@ -59,7 +59,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,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)
@@ -473,15 +473,15 @@ def checkProductXml(nbr_record = -1)
 end
 
 describe Oddb2xml::Builder do
-  NrExtendedArticles = 76
-  NrSubstances = 27
-  NrLimitations = 14
-  
+  NrExtendedArticles = 78
+  NrSubstances = 28
+  NrLimitations = 15
+
   NrInteractions = 2
   NrCodes = 5
   NrProdno = 31
-  NrPackages = 44
-  NrProducts = 39
+  NrPackages = 46
+  NrProducts = 40
   RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
   include ServerMockHelper
   def common_run_init(options = {})
@@ -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/cli_spec.rb

@@ -184,6 +184,32 @@ describe Oddb2xml::Cli do
             }
     end
   end
+  context 'when  -e and -f dat option is given' do
+    before(:all) do
+      cleanup_directories_before_run
+      options = Oddb2xml::Options.parse('-e -f dat')
+      @cli = Oddb2xml::Cli.new(options)
+      @cli_output = buildr_capture(:stdout) { @cli.run }
+    end
+    it_behaves_like 'any interface for product'
+    it 'should have calc option' do
+      expect(@cli).to have_option(:format => :dat)
+      expect(@cli).to have_option(:calc => true)
+      expect(@cli).to have_option(:extended => true)
+    end
+    it 'should create xml files' do
+      expect(@cli_output).to match(/NonPharma/)
+      file_today = "oddb_calc_#{Time.now.strftime("%d.%m.%Y_%H.%M")}.xml"
+      expect(Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_calc.xml')).size).to eq 1
+      expect(Dir.glob(File.join(Oddb2xml::WorkDir, file_today)).size).to eq 1
+    end
+    it 'should create migel files' do
+      expect(@cli_output).to match(/NonPharma/)
+      file_today = "oddb_with_migel_#{Time.now.strftime("%d.%m.%Y_%H.%M")}.dat"
+      expect(Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_with_migel.dat')).size).to eq 1
+      expect(Dir.glob(File.join(Oddb2xml::WorkDir, file_today)).size).to eq 1
+    end
+  end
 
   context 'when -a nonpharma option is given' do
     before(:all) do

data/spec/data/Preparations.xml

@@ -1,5 +1,141 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <Preparations ReleaseDate="01.12.2013">
+  <Preparation ProductCommercial="9801">
+    <NameDe>Varilrix</NameDe>
+    <NameFr>Varilrix</NameFr>
+    <NameIt>Varilrix</NameIt>
+    <DescriptionDe>Trockensub c solv</DescriptionDe>
+    <DescriptionFr>subst sèche c solv </DescriptionFr>
+    <DescriptionIt>sost secca c solv </DescriptionIt>
+    <AtcCode>J07BK01</AtcCode>
+    <SwissmedicNo5>585</SwissmedicNo5>
+    <FlagItLimitation>Y</FlagItLimitation>
+    <OrgGenCode />
+    <FlagSB20>N</FlagSB20>
+    <CommentDe />
+    <CommentFr />
+    <CommentIt />
+    <VatInEXF>N</VatInEXF>
+    <Packs>
+      <Pack ProductKey="9801" PackId="14418">
+        <DescriptionDe>Fertspr 0.500 ml</DescriptionDe>
+        <DescriptionFr>ser prê 0.500 ml</DescriptionFr>
+        <DescriptionIt>sir preriempita 0.500 ml</DescriptionIt>
+        <SwissmedicCategory>B</SwissmedicCategory>
+        <SwissmedicNo8>585001</SwissmedicNo8>
+        <FlagNarcosis>N</FlagNarcosis>
+        <FlagModal />
+        <BagDossierNo>18076</BagDossierNo>
+        <GTIN>7680005850010</GTIN>
+        <SizePack />
+        <PrevPharmacode />
+        <Limitations />
+        <PointLimitations />
+        <Prices>
+          <ExFactoryPrice>
+            <Price>43.64</Price>
+            <ValidFromDate>01.12.2019</ValidFromDate>
+            <DivisionDescription />
+            <PriceTypeCode>PEXF</PriceTypeCode>
+            <PriceTypeDescriptionDe>Ex-Factory Preis</PriceTypeDescriptionDe>
+            <PriceTypeDescriptionFr>Prix ex-factory</PriceTypeDescriptionFr>
+            <PriceTypeDescriptionIt>Prix ex-factory</PriceTypeDescriptionIt>
+            <PriceChangeTypeCode>3JUEBERPRUEF</PriceChangeTypeCode>
+            <PriceChangeTypeDescriptionDe>Preisänderung nach 3-jährlicher Überprüfung der Aufnahmebedingungen</PriceChangeTypeDescriptionDe>
+            <PriceChangeTypeDescriptionFr>Réduction de prix à cause du réexamen des conditions d’admission tous les trois ans</PriceChangeTypeDescriptionFr>
+            <PriceChangeTypeDescriptionIt>Preisänderung nach 3-jährlicher Überprüfung der Aufnahmebedingungen</PriceChangeTypeDescriptionIt>
+          </ExFactoryPrice>
+          <PublicPrice>
+            <Price>66.5</Price>
+            <ValidFromDate>01.12.2019</ValidFromDate>
+            <DivisionDescription />
+            <PriceTypeCode>PPUB</PriceTypeCode>
+            <PriceTypeDescriptionDe>Publikumspreis</PriceTypeDescriptionDe>
+            <PriceTypeDescriptionFr>Prix public</PriceTypeDescriptionFr>
+            <PriceTypeDescriptionIt>Prix public</PriceTypeDescriptionIt>
+            <PriceChangeTypeCode>3JUEBERPRUEF</PriceChangeTypeCode>
+            <PriceChangeTypeDescriptionDe>Preisänderung nach 3-jährlicher Überprüfung der Aufnahmebedingungen</PriceChangeTypeDescriptionDe>
+            <PriceChangeTypeDescriptionFr>Réduction de prix à cause du réexamen des conditions d’admission tous les trois ans</PriceChangeTypeDescriptionFr>
+            <PriceChangeTypeDescriptionIt>Preisänderung nach 3-jährlicher Überprüfung der Aufnahmebedingungen</PriceChangeTypeDescriptionIt>
+          </PublicPrice>
+        </Prices>
+        <Partners>
+          <Partner>
+            <PartnerType>V</PartnerType>
+            <Description>GlaxoSmithKline AG</Description>
+            <Street>Talstrasse 3-5</Street>
+            <ZipCode>3053</ZipCode>
+            <Place>Münchenbuchsee</Place>
+            <Phone>+41318622111</Phone>
+          </Partner>
+        </Partners>
+        <Status>
+          <IntegrationDate>01.01.2005</IntegrationDate>
+          <ValidFromDate>01.01.2005</ValidFromDate>
+          <ValidThruDate>31.12.9999</ValidThruDate>
+          <StatusTypeCodeSl>0</StatusTypeCodeSl>
+          <StatusTypeDescriptionSl>Initialzustand</StatusTypeDescriptionSl>
+          <FlagApd>N</FlagApd>
+        </Status>
+      </Pack>
+    </Packs>
+    <Substances>
+      <Substance>
+        <DescriptionLa>Vaccinum virus varicellae vivus attenuat. (Stamm OKA)</DescriptionLa>
+        <Quantity>10^3.3</Quantity>
+        <QuantityUnit>U</QuantityUnit>
+      </Substance>
+    </Substances>
+    <Limitations />
+    <ItCodes>
+      <ItCode Code="08.">
+        <DescriptionDe>INFEKTIONSKRANKHEITEN</DescriptionDe>
+        <DescriptionFr>MALADIES INFECTIEUSES</DescriptionFr>
+        <DescriptionIt>MALATTIE INFETTIVE </DescriptionIt>
+        <Limitations />
+      </ItCode>
+      <ItCode Code="08.08.">
+        <DescriptionDe>Impfstoffe</DescriptionDe>
+        <DescriptionFr>Vaccins</DescriptionFr>
+        <DescriptionIt>Vaccini </DescriptionIt>
+        <Limitations>
+          <Limitation>
+            <LimitationCode>0808</LimitationCode>
+            <LimitationType>KOM</LimitationType>
+            <LimitationNiveau>I</LimitationNiveau>
+            <DescriptionDe>Die Kostenübernahme der Impfstoffe als Teil einer präventiven Massnahme im Rahmen der obligatorischen Krankenpflegeversicherung richtet sich nach den in Artikel 12a KLV für die jeweiligen Impfungen abschliessend festgelegten Voraussetzungen. Bei beruflicher und reisemedizinischer Indikation erfolgt keine Kostenübernahme durch die obligatorische Krankenpflegeversicherung.&lt;br&gt;
+Die Preise der Impfstoffe sind Höchstpreise (Art. 52 Abs. 3 KVG) und kommen bei Reihenimpfungen (z.B. im schulärztlichen Dienst) nicht zur Anwendung. In diesen Fällen gelten die von den Krankenversicherern mit den zuständigen Behörden ausgehandelten bzw. die allenfalls von den Behörden festgesetzten Tarife. Wenn der Impfstoff zu einem günstigeren Preis bezogen wird (z.B. im Rahmen von Reihenimpfungen), darf der Arzt oder die Ärztin nicht den Publikumspreis der SL verrechnen. Die Vergünstigung muss gemäss Artikel 56 Absatz 3 KVG weitergegeben werden.&lt;br&gt;
+&lt;br&gt;
+Die Vergünstigung muss gemäss Artikel 56 Absatz 3 KVG weitergegeben werden, ausser es bestehen Vereinbarungen nach Artikel 56 Absatz 3bis KVG.&lt;br&gt;
+&lt;br&gt;
+</DescriptionDe>
+            <DescriptionFr>La prise en charge des coûts des vaccins au titre de mesure préventive dans le cadre de l'assurance maladie obligatoire des soins est régie par les conditions contraignantes fixées à l'article 12a OPAS pour les vaccinations correspondantes. En cas d'indication professionnelle et de recommandation médicale aux voyageurs, la vaccination n'est pas prise en charge par l'assurance maladie obligatoire des soins. Les prix des vaccins sont des prix maximaux (art. 52, al. 3, LAMal) et ne s'appliquent pas aux vaccinations en série (par ex. dans le service médical scolaire). Dans ce cas, les tarifs négociés par les assureurs maladie avec les autorités compétentes ou, le cas échéant, ceux fixés par les autorités, sont applicables. Si le vaccin est acheté à un prix inférieur (par exemple dans le cadre d'une série de vaccinations), le médecin ne peut pas le facturer au prix public de la LS.  L'avantage doit être répercuté conformément à l'article 56, al. 3, LAMal.&lt;br&gt;
+&lt;br&gt;
+L'avantage doit être répercuté conformément à l'article 56, al. 3, LAMal, hormis si des conventions au sens de l'art. 56, al. 3bis, LAMal, ont été conclues.&lt;br&gt;
+&lt;br&gt;
+
+</DescriptionFr>
+            <DescriptionIt>L’assunzione dei costi dei vaccini, in quanto misura di prevenzione parziale nel quadro dell’assicurazione obbligatoria delle cure medico-sanitarie, è disciplinata in modo esauriente dalle condizioni fissate per i vaccini interessati nell’articolo 12a OPre. In caso di indicazione professionale e di medicina di viaggio, l’assicurazione obbligatoria delle cure medico-sanitarie non ne assume i costi.&lt;br&gt;
+I prezzi dei vaccini sono prezzi massimi (art. 52 cpv. 3 LAMal) e non si applicano alle vaccinazioni in serie (ad. es. quelle effettuate nell’ambito del servizio medico scolastico). In questi casi sono applicabili le tariffe negoziate dagli assicuratori malattie con le autorità competenti o quelle eventualmente stabilite dalle autorità. Se il vaccino è acquistato a un prezzo più conveniente (p. es. nel quadro di vaccinazioni in serie), il medico non può fatturare il prezzo per il pubblico che figura nell’ES. Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capoverso 3 LAMal.&lt;br&gt;
+&lt;br&gt;
+Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capoverso 3 LAMal, tranne in caso di accordi di cui all’articolo 56 capoverso 3bis LAMal.&lt;br&gt;
+&lt;br&gt;
+</DescriptionIt>
+            <ValidFromDate>01.01.2000</ValidFromDate>
+            <ValidThruDate>31.12.9999</ValidThruDate>
+          </Limitation>
+        </Limitations>
+      </ItCode>
+    </ItCodes>
+    <Status>
+      <IntegrationDate>01.01.2005</IntegrationDate>
+      <ValidFromDate>01.01.2005</ValidFromDate>
+      <ValidThruDate>31.12.9999</ValidThruDate>
+      <StatusTypeCodeSl>0</StatusTypeCodeSl>
+      <StatusTypeDescriptionSl>Initialzustand</StatusTypeDescriptionSl>
+      <FlagApd>N</FlagApd>
+    </Status>
+  </Preparation>
   <Preparation ProductCommercial="394">
     <NameDe>Ancopir</NameDe>
     <NameFr>Ancopir</NameFr>
@@ -1239,7 +1375,7 @@
       <StatusTypeDescriptionSl>Initialzustand</StatusTypeDescriptionSl>
       <FlagApd>N</FlagApd>
     </Status>
-  </Preparation>  
+  </Preparation>
   <Preparation ProductCommercial="25550">
     <NameDe>Adcetris</NameDe>
     <NameFr>Adcetris</NameFr>
@@ -2913,8 +3049,8 @@ Le médecin traitant est tenu de saisir en continu les données requises dans l'
 2)         Date du début de traitement, posologie, ajustements posologiques, date de fin de traitement.
 
 </DescriptionFr>
-        <DescriptionIt>Per la terapia di mantenimento (monoterapia) in pazienti adulte con carcinoma ovarico avanzato e recidivo, con mutazione BRCA, successivamente a una chemioterapia a base di platino e in presenza di una remissione parziale o completa.&lt;br&gt; 
-Il medico curante è tenuto a raccogliere costantemente i dati necessari nell’apposito strumento internet del registro, disponibile su http://www.olaparib-registry.ch. È necessario il consenso scritto della paziente. Devono essere raccolti i seguenti dati:&lt;br&gt; 
+        <DescriptionIt>Per la terapia di mantenimento (monoterapia) in pazienti adulte con carcinoma ovarico avanzato e recidivo, con mutazione BRCA, successivamente a una chemioterapia a base di platino e in presenza di una remissione parziale o completa.&lt;br&gt;
+Il medico curante è tenuto a raccogliere costantemente i dati necessari nell’apposito strumento internet del registro, disponibile su http://www.olaparib-registry.ch. È necessario il consenso scritto della paziente. Devono essere raccolti i seguenti dati:&lt;br&gt;
 1)         Anno di nascita e terapie precedenti per il carcinoma ovarico&lt;br&gt;
 2)         Data di inizio della terapia, dosaggio, aggiustamenti del dosaggio, data di conclusione della terapia.
 </DescriptionIt>

data/spec/data/refdata_Pharma.xml

@@ -2,6 +2,17 @@
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <soap:Body>
       <ARTICLE xmlns="http://refdatabase.refdata.ch/Article_out" CREATION_DATETIME="2017-12-01T09:41:49.5856186+01:00">
+      <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>
+        <ATC>J07BK01</ATC>
+        <AUTH_HOLDER_NAME>GlaxoSmithKline AG</AUTH_HOLDER_NAME>
+        <AUTH_HOLDER_GLN>7601001000674</AUTH_HOLDER_GLN>
+      </ITEM>
       <ITEM DT="2017-12-14T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680545340019</GTIN>

data/spec/data/transfer.dat

@@ -69,4 +69,5 @@
 1122069562EINF ARZNEI Urtinktur 1-10g/ml                    0010040013401000000000025000005884712
 1122069639EINF ARZNEI Ceres Urtinktur spez 20ml             0023440031301000000000025000005885322
 1122069622EINF ARZNEI Ceres Urtinktur 20ml                  0018870025201000000000025000005885252
-
+1131770177VARILRIX Trockensub c Solv (alt) Fertspr 0.5 ml   004768006650101B080800076800058500102
+1127766692VARILRIX Trockensub c Solv Fertspr 0.5 ml         004767006650101B080800076800058500342

data/spec/data/varia_De.htm

@@ -197,7 +197,7 @@
 <p>70.01.10</p>
     </td>
     <td width="52%">
-<p>Ceres Urtinkturen gem&auml;ss L2</p>
+<p>Ceres Urtinkturen gem&auml;ss L2 mit -- im Kommentar</p>
     </td>
     <td align="right" width="10%">
 <p>20ml</p>
@@ -2438,4 +2438,4 @@ die Abrechnung zu erleichtern.<br>
 
 </body>
 
-</html>
+</html>

data/spec/extractor_spec.rb

@@ -182,7 +182,7 @@ describe Oddb2xml::SwissmedicExtractor do
       @packs.find{|pack| pack[1][:ean13] == ean13.to_s }[1]
     end
     it 'should have correct nr of packages' do
-      expect(@packs.size).to eq(40)
+      expect(@packs.size).to eq(41)
     end
 
     it 'should have serocytol' do

data/spec/spec_helper.rb

@@ -257,7 +257,7 @@ def mock_downloads
       '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://www.xn--spezialittenliste-yqb.ch/File.axd?file=XMLPublications.zip' => 'XMLPublications.zip',
-      'http://bag.e-mediat.net/Sl2007.web.external/varia_De.htm' => 'varia_De.htm',
+      '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.5
+  version: 2.7.0
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -479,15 +479,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.