oddb2xml 2.6.7 → 2.7.2

data/lib/oddb2xml/chapter_70_hack.rb

@@ -1,14 +1,19 @@
-# encoding: utf-8
-require 'oddb2xml/extractor'
-require 'ox'
-require 'open-uri'
+require "oddb2xml/extractor"
+require "ox"
+require "open-uri"
 
 module Oddb2xml
   class Chapter70xtractor < Extractor
-    def Chapter70xtractor.parse_td(elem)
+    def self.parse_td(elem)
       begin
         values = elem.is_a?(Array) ? elem : elem.values
-        res = values.flatten.collect{|x| x.nil? ? nil : x.is_a?(Hash) ? x.values : x.gsub(/\r\n/,'').strip }
+        res = values.flatten.collect { |x|
+          if x.nil?
+            nil
+          else
+            x.is_a?(Hash) ? x.values : x.gsub(/\r\n/, "").strip
+          end
+        }
         puts "parse_td returns: #{res}" if $VERBOSE
       rescue => exc
         puts "Unable to pars #{elem} #{exc}"
@@ -18,53 +23,54 @@ module Oddb2xml
       res.flatten # .join("\t")
     end
     LIMITATIONS = {
-      'L'  => 'Kostenübernahme nur nach vorgängiger allergologischer Abklärung.',
-      'L1' => 'Eine Flasche zu 20 ml Urtinktur einer bestimmten Pflanze pro Monat.',
-      'L1, L2' => '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.',
-      'L3' => 'Alle drei Monate wird eine Verordnung/Originalpackung pro Mittel vergütet.',
+      "L" => "Kostenübernahme nur nach vorgängiger allergologischer Abklärung.",
+      "L1" => "Eine Flasche zu 20 ml Urtinktur einer bestimmten Pflanze pro Monat.",
+      "L1, L2" => "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.",
+      "L3" => "Alle drei Monate wird eine Verordnung/Originalpackung pro Mittel vergütet."
     }
     def self.items
       @@items
     end
-    def self.parse(html_file = 'http://www.spezialitaetenliste.ch/varia_De.htm')
-      data = Hash.new{|h,k| h[k] = [] }
+
+    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
+        mode: :generic,
+        effort: :tolerant,
+        smart: true
       }
-      res = Ox.load(URI.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 = {}
       res.values.last.each do |item|
-        item.values.first.each do |subElem|
-          what =  Chapter70xtractor.parse_td(subElem)
+        item.values.first.each do |sub_elem|
+          what = Chapter70xtractor.parse_td(sub_elem)
           idx += 1
           puts "#{idx}: xx #{what}" if $VERBOSE
           result << what
         end
       end
-      result2 = result.find_all{ |x| (x.is_a?(Array) && x.first.is_a?(String)) && x.first.to_i > 100}
+      result2 = result.find_all { |x| (x.is_a?(Array) && x.first.is_a?(String)) && x.first.to_i > 100 }
       result2.each do |entry|
         data = {}
         pharma_code = entry.first
-        ean13 =  (Oddb2xml::FAKE_GTIN_START + pharma_code.to_s)
-        if entry[2].encoding.to_s.eql?('ASCII-8BIT')
-          german = CGI.unescape(entry[2].force_encoding('ISO-8859-1'))
+        ean13 = (Oddb2xml::FAKE_GTIN_START + pharma_code.to_s)
+        german = if entry[2].encoding.to_s.eql?("ASCII-8BIT")
+          CGI.unescape(entry[2].force_encoding("ISO-8859-1"))
         else
-          german = entry[2]
+          entry[2]
         end
         @@items[ean13] = {
-          :data_origin   => 'Chapter70',
-          :line   => entry.join(","),
-          :ean13 => ean13,
-          :description => german,
-          :quantity => entry[3],
-          :pharmacode => pharma_code,
-          :pub_price => entry[4],
-          :limitation => entry[5],
-          :type => :pharma,
+          data_origin: "Chapter70",
+          line: entry.join(","),
+          ean13: ean13,
+          description: german,
+          quantity: entry[3],
+          pharmacode: pharma_code,
+          pub_price: entry[4],
+          limitation: entry[5],
+          type: :pharma
         }
       end
       result2

data/lib/oddb2xml/cli.rb

@@ -1,25 +1,21 @@
-# encoding: utf-8
-
-require 'thread'
-require 'oddb2xml/builder'
-require 'oddb2xml/downloader'
-require 'oddb2xml/extractor'
-require 'oddb2xml/compressor'
-require 'oddb2xml/options'
-require 'oddb2xml/util'
-require 'rubyXL'
-require 'date' # for today
+require "oddb2xml/builder"
+require "oddb2xml/downloader"
+require "oddb2xml/extractor"
+require "oddb2xml/compressor"
+require "oddb2xml/options"
+require "oddb2xml/util"
+require "rubyXL"
+require "date" # for today
 
 module Oddb2xml
-
   class Cli
     attr_reader :options
-    SUBJECTS  = %w[product article]
+    SUBJECTS = %w[product article]
     ADDITIONS = %w[substance limitation interaction code]
     OPTIONALS = %w[fi fi_product]
     def initialize(args)
       @options = args
-      STDOUT.puts "\nStarting cli with from #{caller[1]} using #{@options}" if defined?(RSpec)
+      $stdout.puts "\nStarting cli with from #{caller(2..2).first} using #{@options}" if defined?(RSpec)
       Oddb2xml.save_options(@options)
       @mutex = Mutex.new
       # product
@@ -28,21 +24,22 @@ module Oddb2xml
       @lppvs = {} # lppv.txt from files repo
       @infos = {} # [option] FI from SwissmedicInfo
       @packs = {} # [option] Packungen from Swissmedic for dat
-      @infos_zur_rose  = {} # [addition] infos_zur_rose and other infos from zurrose transfer.txt
-      @migel   = {} # [addition] additional Non Pharma products from files repo
+      @infos_zur_rose = {} # [addition] infos_zur_rose and other infos from zurrose transfer.txt
+      @migel = {} # [addition] additional Non Pharma products from files repo
       @actions = [] # [addition] interactions from epha
       @orphan = [] # [addition] Orphaned drugs from Swissmedic xls
       # addresses
       @companies = [] # betrieb
-      @people    = [] # medizinalperson
+      @people = [] # medizinalperson
       @_message = false
     end
+
     def run
       threads = []
-      startTime = Time.now
-      files2rm = Dir.glob(File.join(Downloads, '*'))
-      FileUtils.rm_f(files2rm, :verbose => @options[:log]) if files2rm.size > 0 and not Oddb2xml.skip_download?
-      if @options[:calc] and not @options[:extended]
+      start_time = Time.now
+      files2rm = Dir.glob(File.join(DOWNLOADS, "*"))
+      FileUtils.rm_f(files2rm, verbose: @options[:log]) if (files2rm.size > 0) && !Oddb2xml.skip_download?
+      if @options[:calc] && !(@options[:extended])
         threads << download(:package) # swissmedic
       elsif @options[:address]
         [:company, :person].each do |type|
@@ -82,146 +79,157 @@ module Oddb2xml
       end
       build
       if @options[:artikelstamm] && system("which xmllint")
-        elexis_v5_xsd = File.expand_path(File.join(__FILE__, '..', '..', '..', 'Elexis_Artikelstamm_v5.xsd'))
-         cmd = "xmllint --noout --schema #{elexis_v5_xsd} #{@_files[:artikelstamm]}"
-         if system(cmd)
-            puts "Validatied #{@_files[:artikelstamm]}"
-         else
-            puts "Validating failed using #{cmd}"
-            exit(2)
-         end
+        elexis_v5_xsd = File.expand_path(File.join(__FILE__, "..", "..", "..", "Elexis_Artikelstamm_v5.xsd"))
+        cmd = "xmllint --noout --schema #{elexis_v5_xsd} #{@the_files[:artikelstamm]}"
+        if system(cmd)
+          puts "Validatied #{@the_files[:artikelstamm]}"
+        else
+          puts "Validating failed using #{cmd}"
+          raise "Validating failed using #{cmd}"
+        end
       end
       compress if @options[:compress_ext]
       res = report
-      nrSecs =  (Time.now - startTime).to_i
-      if defined?(RSpec) && (nrSecs).to_i > 10 && ENV['TRAVIS'].to_s.empty? then require 'pry'; binding.pry ; end
+      nr_secs = (Time.now - start_time).to_i
+      if defined?(RSpec) && nr_secs.to_i > 10 && ENV["TRAVIS"].to_s.empty?
+        puts "Took took long #{nr_secs} seconds"
+        # require "pry"; binding.pry;
+      end
       res
     end
+
     private
+
     def build
-      begin
-        @_files = {"calc"=>"oddb_calc.xml"} if @options[:calc] and not (@options[:extended] || @options[:artikelstamm])
-        builder = Builder.new(@options) do |builder|
-          if @options[:calc] and not  (@options[:extended] || @options[:artikelstamm])
-            builder.packs = @packs
-          elsif @options[:address]
-            builder.companies = @companies
-            builder.people    = @people
-          else # product
-            if @options[:format] != :dat
-              refdata = {}
-              types.each do |type|
-                refdata.merge!(@refdata_types[type]) if @refdata_types[type]
-              end
-              builder.refdata = refdata
-            end
-            # common sources
-            builder.items = @items
-            builder.flags = @flags
-            builder.lppvs = @lppvs
-            # optional sources
-            builder.infos = @infos
-            builder.packs = @packs
-            # additional sources
-            %w[actions orphan migel infos_zur_rose].each do |addition|
-              builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
+      @the_files = {"calc" => "oddb_calc.xml"} if @options[:calc] && !(@options[:extended] || @options[:artikelstamm])
+      builder = Builder.new(@options) do |builder|
+        if @options[:calc] && !(@options[:extended] || @options[:artikelstamm])
+          builder.packs = @packs
+        elsif @options[:address]
+          builder.companies = @companies
+          builder.people = @people
+        else # product
+          if @options[:format] != :dat
+            refdata = {}
+            types.each do |type|
+              refdata.merge!(@refdata_types[type]) if @refdata_types[type]
             end
+            builder.refdata = refdata
+          end
+          # common sources
+          builder.items = @items
+          builder.flags = @flags
+          builder.lppvs = @lppvs
+          # optional sources
+          builder.infos = @infos
+          builder.packs = @packs
+          # additional sources
+          %w[actions orphan migel infos_zur_rose].each do |addition|
+            builder.send("#{addition}=".intern, instance_variable_get("@#{addition}"))
           end
-          builder.tag_suffix = @options[:tag_suffix]
         end
-        files.each_pair do |sbj, file|
-          builder.subject = sbj
-          output = ''
-          if !@options[:address] and (@options[:format] == :dat)
-            types.each do |type|
-              refdata1 = {}
-              _sbj = (type == :pharma ? :dat : :with_migel_dat)
-              builder.refdata = @refdata_types[type]
-              builder.subject = _sbj
-              builder.ean14   = @options[:ean14]
-              if type == :nonpharma
-                output << "\n"
-              end
-              output << builder.to_dat
+        builder.tag_suffix = @options[:tag_suffix]
+      end
+      files.each_pair do |sbj, file|
+        builder.subject = sbj
+        output = ""
+        if !@options[:address] && (@options[:format] == :dat)
+          types.each do |type|
+            a_sby = (type == :pharma ? :dat : :with_migel_dat)
+            builder.refdata = @refdata_types[type]
+            builder.subject = a_sby
+            builder.ean14 = @options[:ean14]
+            if type == :nonpharma
+              output << "\n"
             end
-          else
-            output = builder.to_xml
+            output << builder.to_dat
           end
-          File.open(File.join(WorkDir, file), 'w:utf-8') do |fh|
-            output.split("\n").each do |line|
-              if /.xml$/i.match(file)
-                fh.puts(line)
-              else
-                fh.puts(Oddb2xml.convert_to_8859_1(line))
-              end
+        else
+          output = builder.to_xml
+        end
+        File.open(File.join(WORK_DIR, file), "w:utf-8") do |fh|
+          output.split("\n").each do |line|
+            if /.xml$/i.match?(file)
+              fh.puts(line)
+            else
+              fh.puts(Oddb2xml.convert_to_8859_1(line))
             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)
-          end
         end
-      rescue Interrupt
-        files.values.each do |file|
-          if File.exist? file
-            File.unlink(file) # we don't save it as it might be only partly downloaded
-          end
+        if @options[:calc]
+          ext = File.extname(file)
+          dest = File.join(WORK_DIR, file.sub(ext, "_" + Time.now.strftime("%d.%m.%Y_%H.%M") + ext))
+          FileUtils.cp(File.join(WORK_DIR, file), dest, verbose: false)
         end
-        raise Interrupt
       end
+    rescue Interrupt
+      files.values.each do |file|
+        if File.exist? file
+          File.unlink(file) # we don't save it as it might be only partly downloaded
+        end
+      end
+      raise Interrupt
     end
-    def download(what, type=nil)
+
+    def download(what, type = nil)
       case what
       when :company, :person
-        var = (what == :company ? 'companies' : 'people')
-        begin # instead of Thread.new do
-          downloader = MedregbmDownloader.new(what)
-          str = downloader.download
-          Oddb2xml.log("SwissmedicInfoDownloader #{what} str #{str.size} bytes")
-          self.instance_variable_set(
-            "@#{var}".intern,
-            items = MedregbmExtractor.new(str, what).to_arry
-          )
-          Oddb2xml.log("MedregbmExtractor #{what} added #{items.size} fachinfo")
-          items
-        end
+        var = (what == :company ? "companies" : "people")
+        # instead of Thread.new do
+
+        downloader = MedregbmDownloader.new(what)
+        str = downloader.download
+        Oddb2xml.log("SwissmedicInfoDownloader #{what} str #{str.size} bytes")
+        instance_variable_set(
+          "@#{var}".intern,
+          items = MedregbmExtractor.new(str, what).to_arry
+        )
+        Oddb2xml.log("MedregbmExtractor #{what} added #{items.size} fachinfo")
+        items
+
       when :fachinfo
-        begin # instead of Thread.new do
-          downloader = SwissmedicInfoDownloader.new
-          xml = downloader.download
-          Oddb2xml.log("SwissmedicInfoDownloader #{var} xml #{xml.size} bytes")
-          @mutex.synchronize do
-            hsh = SwissmedicInfoExtractor.new(xml).to_hash
-            @infos = hsh
-            Oddb2xml.log("SwissmedicInfoExtractor added #{@infos.size} fachinfo")
-            @infos
-          end
+        # instead of Thread.new do
+
+        downloader = SwissmedicInfoDownloader.new
+        xml = downloader.download
+        Oddb2xml.log("SwissmedicInfoDownloader #{var} xml #{xml.size} bytes")
+        @mutex.synchronize do
+          hsh = SwissmedicInfoExtractor.new(xml).to_hash
+          @infos = hsh
+          Oddb2xml.log("SwissmedicInfoExtractor added #{@infos.size} fachinfo")
+          @infos
         end
+
       when :orphan
         var = what.to_s
-        begin # instead of Thread.new do
-          downloader = SwissmedicDownloader.new(what, @options)
-          bin = downloader.download
-          Oddb2xml.log("SwissmedicDownloader #{var} #{bin} #{File.size(bin)} bytes")
-          self.instance_variable_set(
-            "@#{var}",
-            items = SwissmedicExtractor.new(bin, what).to_arry
-          )
-          Oddb2xml.log("SwissmedicExtractor added #{items.size}")
-          items
-        end
+        # instead of Thread.new do
+
+        downloader = SwissmedicDownloader.new(what, @options)
+        bin = downloader.download
+        Oddb2xml.log("SwissmedicDownloader #{var} #{bin} #{File.size(bin)} bytes")
+        instance_variable_set(
+          "@#{var}",
+          items = SwissmedicExtractor.new(bin, what).to_arry
+        )
+        Oddb2xml.log("SwissmedicExtractor added #{items.size}")
+        items
+
       when :interaction
-        begin # instead of Thread.new do
-          downloader = EphaDownloader.new
-          str = downloader.download
-          Oddb2xml.log("EphaDownloader str #{str.size} bytes")
-          @mutex.synchronize do
-            @actions = EphaExtractor.new(str).to_arry
-            Oddb2xml.log("EphaExtractor added #{@actions.size} interactions")
-            @actions
-          end
+        # instead of Thread.new do
+
+        downloader = EphaDownloader.new
+        str = downloader.download
+        Oddb2xml.log("EphaDownloader str #{str.size} bytes")
+        @mutex.synchronize do
+          @actions = EphaExtractor.new(str).to_arry
+          Oddb2xml.log("EphaExtractor added #{@actions.size} interactions")
+          @actions
         end
+
       when :migel
-        begin # instead of Thread.new do
+        # instead of Thread.new do
+        unless SKIP_MIGEL_DOWNLOADER
+
           downloader = MigelDownloader.new
           bin = downloader.download
           Oddb2xml.log("MigelDownloader bin #{bin.size} bytes")
@@ -230,99 +238,107 @@ module Oddb2xml
             Oddb2xml.log("MigelExtractor added #{@migel.size} migel items")
             @migel
           end
-        end unless SkipMigelDownloader
+
+        end
       when :package
-        begin # instead of Thread.new do
-          downloader = SwissmedicDownloader.new(:package, @options)
-          bin = downloader.download
-          Oddb2xml.log("SwissmedicDownloader package #{bin} #{File.size(bin)} bytes")
-          @mutex.synchronize do
-            @packs = SwissmedicExtractor.new(bin, :package).to_hash
-            Oddb2xml.log("SwissmedicExtractor added #{@packs.size} packs from #{bin}")
-            @packs
-          end
+        # instead of Thread.new do
+
+        downloader = SwissmedicDownloader.new(:package, @options)
+        bin = downloader.download
+        Oddb2xml.log("SwissmedicDownloader package #{bin} #{File.size(bin)} bytes")
+        @mutex.synchronize do
+          @packs = SwissmedicExtractor.new(bin, :package).to_hash
+          Oddb2xml.log("SwissmedicExtractor added #{@packs.size} packs from #{bin}")
+          @packs
         end
+
       when :lppv
-        begin # instead of Thread.new do
-          downloader = LppvDownloader.new
-          str = downloader.download
-          Oddb2xml.log("LppvDownloader str #{str.size} bytes")
-          @mutex.synchronize do
-            @lppvs = LppvExtractor.new(str).to_hash
-            Oddb2xml.log("LppvExtractor added #{@lppvs.size} lppvs")
-            @lppvs
-          end
+        # instead of Thread.new do
+
+        downloader = LppvDownloader.new
+        str = downloader.download
+        Oddb2xml.log("LppvDownloader str #{str.size} bytes")
+        @mutex.synchronize do
+          @lppvs = LppvExtractor.new(str).to_hash
+          Oddb2xml.log("LppvExtractor added #{@lppvs.size} lppvs")
+          @lppvs
         end
+
       when :bag
-        begin # instead of Thread.new do
-          downloader = BagXmlDownloader.new(@options)
-          xml = downloader.download
-          Oddb2xml.log("BagXmlDownloader xml #{xml.size} bytes")
-          @mutex.synchronize do
-            hsh = BagXmlExtractor.new(xml).to_hash
-            @items = hsh
-            Oddb2xml.log("BagXmlExtractor added #{@items.size} items.")
-            @items
-          end
+        # instead of Thread.new do
+
+        downloader = BagXmlDownloader.new(@options)
+        xml = downloader.download
+        Oddb2xml.log("BagXmlDownloader xml #{xml.size} bytes")
+        @mutex.synchronize do
+          hsh = BagXmlExtractor.new(xml).to_hash
+          @items = hsh
+          Oddb2xml.log("BagXmlExtractor added #{@items.size} items.")
+          @items
         end
+
       when :zurrose
-        begin # instead of Thread.new do
-          downloader = ZurroseDownloader.new(@options, @options[:transfer_dat])
-          xml = downloader.download
-          Oddb2xml.log("ZurroseDownloader xml #{xml.size} bytes")
-          @mutex.synchronize do
-            hsh = ZurroseExtractor.new(xml, @options[:extended], @options[:artikelstamm]).to_hash
-            Oddb2xml.log("ZurroseExtractor added #{hsh.size} items from xml with #{xml.size} bytes")
-            @infos_zur_rose = hsh
-          end
+        # instead of Thread.new do
+
+        downloader = ZurroseDownloader.new(@options, @options[:transfer_dat])
+        xml = downloader.download
+        Oddb2xml.log("ZurroseDownloader xml #{xml.size} bytes")
+        @mutex.synchronize do
+          hsh = ZurroseExtractor.new(xml, @options[:extended], @options[:artikelstamm]).to_hash
+          Oddb2xml.log("ZurroseExtractor added #{hsh.size} items from xml with #{xml.size} bytes")
+          @infos_zur_rose = hsh
         end
+
       when :refdata
-        begin # instead of Thread.new do
-          downloader = RefdataDownloader.new(@options, type)
-          begin
-            xml = downloader.download
-            Oddb2xml.log("RefdataDownloader #{type} xml #{xml.size} bytes")
-            xml
-          rescue SystemExit
-            @mutex.synchronize do
-              unless @_message # hook only one exit
-                @_message = true
-                exit
-              end
-            end
-          end
+        # instead of Thread.new do
+
+        downloader = RefdataDownloader.new(@options, type)
+        begin
+          xml = downloader.download
+          Oddb2xml.log("RefdataDownloader #{type} xml #{xml.size} bytes")
+          xml
+        rescue SystemExit
           @mutex.synchronize do
-            hsh = RefdataExtractor.new(xml, type).to_hash
-            @refdata_types[type] = hsh
-            Oddb2xml.log("RefdataExtractor #{type} added #{hsh.size} keys now #{@refdata_types.keys} items from xml with #{xml.size} bytes")
-            @refdata_types[type]
+            unless @_message # hook only one exit
+              @_message = true
+              exit
+            end
           end
         end
+        @mutex.synchronize do
+          hsh = RefdataExtractor.new(xml, type).to_hash
+          @refdata_types[type] = hsh
+          Oddb2xml.log("RefdataExtractor #{type} added #{hsh.size} keys now #{@refdata_types.keys} items from xml with #{xml.size} bytes")
+          @refdata_types[type]
+        end
+
       end
     end
+
     def compress
       compressor = Compressor.new(prefix, @options)
       files.values.each do |file|
-        work_file = File.join(WorkDir, file)
-        if File.exists?(work_file)
+        work_file = File.join(WORK_DIR, file)
+        if File.exist?(work_file)
           compressor.contents << work_file
         end
       end
       compressor.finalize!
     end
+
     def files
-      unless @_files
-        @_files = {}
-        @_files[:calc] = "oddb_calc.xml" if @options[:calc]
+      unless @the_files
+        @the_files = {}
+        @the_files[:calc] = "oddb_calc.xml" if @options[:calc]
         if @options[:artikelstamm]
-          @_files[:artikelstamm]           = "artikelstamm_#{Date.today.strftime('%d%m%Y')}_v5.xml"
+          @the_files[:artikelstamm] = "artikelstamm_#{Date.today.strftime("%d%m%Y")}_v5.xml"
         elsif @options[:address]
-          @_files[:company] = "#{prefix}_betrieb.xml"
-          @_files[:person]  = "#{prefix}_medizinalperson.xml"
+          @the_files[:company] = "#{prefix}_betrieb.xml"
+          @the_files[:person] = "#{prefix}_medizinalperson.xml"
         elsif @options[:format] == :dat
-          @_files[:dat] = "#{prefix}.dat"
+          @the_files[:dat] = "#{prefix}.dat"
           if @options[:nonpharma] # into one file
-            @_files[:dat] = "#{prefix}_with_migel.dat"
+            @the_files[:dat] = "#{prefix}_with_migel.dat"
           end
         else # xml
           ##
@@ -330,18 +346,20 @@ module Oddb2xml
           #   1. additions
           #   2. subjects
           #   3. optional SUBJECTS
-          _files = (ADDITIONS + SUBJECTS)
-          _files += OPTIONALS if @options[:fi]
-          _files.each do|sbj|
-            @_files[sbj] = "#{prefix}_#{sbj.to_s}.xml"
+          the_files = (ADDITIONS + SUBJECTS)
+          the_files += OPTIONALS if @options[:fi]
+          the_files.each do |sbj|
+            @the_files[sbj] = "#{prefix}_#{sbj}.xml"
           end
         end
       end
-      @_files
+      @the_files
     end
+
     def prefix
-      @_prefix ||= (@options[:tag_suffix] || 'oddb').gsub(/^_|_$/, '').downcase
+      @_prefix ||= (@options[:tag_suffix] || "oddb").gsub(/^_|_$/, "").downcase
     end
+
     def report
       lines = []
       if @options[:calc]
@@ -350,45 +368,46 @@ module Oddb2xml
         lines << Calc.report_conversion
         lines << ParseComposition.report
       end
-      if  @options[:artikelstamm]
+      if @options[:artikelstamm]
         lines << "Generated artikelstamm.xml for Elexis"
         lines += Builder.articlestamm_v5_info_lines
+      elsif @options[:address]
+        {
+          "Betrieb" => :@companies,
+          "Person" => :@people
+        }.each do |type, var|
+          lines << sprintf(
+            "#{type} addresses: %i", instance_variable_get(var).length
+          )
+        end
       else
-        unless @options[:address]
-          types.each do |type|
-            if @refdata_types[type]
-              indices = @refdata_types[type].values.flatten.length
+        types.each do |type|
+          if @refdata_types[type]
+            indices = @refdata_types[type].values.flatten.length
 
-              if type == :nonpharma
-                nonpharmas = @refdata_types[type].keys
-                if SkipMigelDownloader
-                  indices + nonpharmas.length
-                else
-                  migel_xls  = @migel.values.compact.select{|m| !m[:pharmacode]}.map{|m| m[:pharmacode] }
-                  indices += (migel_xls - nonpharmas).length # ignore duplicates, null
-                end
-                lines << sprintf("\tNonPharma products: %i", indices)
+            if type == :nonpharma
+              nonpharmas = @refdata_types[type].keys
+              if SKIP_MIGEL_DOWNLOADER
+                indices + nonpharmas.length
               else
-                lines << sprintf("\tPharma products: %i", indices)
+                migel_xls = @migel.values.compact.select { |m| !m[:pharmacode] }.map { |m| m[:pharmacode] }
+                indices += (migel_xls - nonpharmas).length # ignore duplicates, null
               end
+              lines << sprintf("\tNonPharma products: %i", indices)
+            else
+              lines << sprintf("\tPharma products: %i", indices)
             end
           end
-          if  (@options[:extended] || @options[:artikelstamm])
-            lines << sprintf("\tInformation items zur Rose: %i", @infos_zur_rose.length)
-          end
-        else
-          {
-            'Betrieb' => :@companies,
-            'Person'  => :@people
-          }.each do |type, var|
-            lines << sprintf(
-              "#{type} addresses: %i", self.instance_variable_get(var).length)
-          end
+        end
+        if @options[:extended] || @options[:artikelstamm]
+          lines << sprintf("\tInformation items zur Rose: %i", @infos_zur_rose.length)
         end
       end
       puts lines.join("\n")
     end
-    def types # RefData
+
+    # RefData
+    def types
       @_types ||=
         if @options[:nonpharma] || @options[:artikelstamm]
           [:pharma, :nonpharma]