oddb2xml 1.3.8 → 1.3.9

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.9 / 14.02.2013
+
+* Add address xml output
+  - oddb2xml --context address
+  - oddb2xml -x addr
+
 === 1.3.8 / 09.02.2013
 
 * Add valid INDEX entries to product.xml

data/Manifest.txt

@@ -19,17 +19,17 @@ spec/cli_spec.rb
 spec/compressor_spec.rb
 spec/data/XMLPublications.zip
 spec/data/epha_interactions.csv
+spec/data/medregbm_betrieb.txt
+spec/data/medregbm_person.txt
 spec/data/oddb2xml_files_bm_update.txt
 spec/data/oddb2xml_files_lppv.txt
+spec/data/oddb2xml_files_nonpharma.xls
 spec/data/oddb_article.xml
 spec/data/oddb_fi.xml
 spec/data/oddb_fi_product.xml
 spec/data/oddb_limitation.xml
 spec/data/oddb_product.xml
 spec/data/oddb_substance.xml
-spec/data/oddb2xml_files_nonpharma.xls
-spec/data/oddb2xml_files_lppv.txt
-spec/data/oddb2xml_files_bm_update.txt
 spec/data/swissindex.xml
 spec/data/swissindex_nonpharma.xml
 spec/data/swissindex_pharma.xml

data/README.md

@@ -229,7 +229,7 @@ You can confirm wit `ruby -ropenssl -e 'p OpenSSL::X509::DEFAULT_CERT_FILE'`.
 3. Click "Advanced" Tab.
 4. Click "Environment Variables" button.
 5. Add set variable entry "SSL\_CERT\_FILE=%HOMEPATH%\cacert.pem"
-  * Variable name: SSL\_CCERT\_FILE
+  * Variable name: SSL\_CERT\_FILE
   * Variable value: %HOMEPATH%\cacert.pem
   * with "New..." button into upper are "User variables for xxx"
 6. Do not remove this cacert.pem. All SSLv3 connections use this file.

data/bin/oddb2xml

@@ -17,21 +17,23 @@ Usage:
     -c F, --compress=F   Compress format F. {tar.gz|zip}
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
-    -o O, --optional=O   Optional output. O, only 'fi' is available.
+    -o O, --option=O     Optional output. O, only 'fi' is available.
     -i I, --include=I    Include target option for 'dat' format. only 'ean14' is available.
                          'xml' format includes always ean14 records.
     -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9]
                          If S is given, it is also used as prefix of filename.
+    -x X, --context      context for address (betrieb and person).
     -h,   --help         Show this help message.
 EOS
 end
 
 parser = OptionParser.new
 opts = {
+  :fi           => false,
+  :adr          => false,
   :nonpharma    => false,
   :compress_ext => nil,
   :format       => :xml,
-  :fi           => false,
   :tag_suffix   => nil,
   :debug        => false,
   :ean14        => false,
@@ -40,9 +42,10 @@ opts = {
 parser.on('-a v', '--append v',     /^nonpharma$/)  {|v| opts[:nonpharma] = true }
 parser.on('-c v', '--compress v',   /^tar\.gz|zip$/){|v| opts[:compress_ext] = v }
 parser.on('-f v', '--format v',     /^xml|dat$/)    {|v| opts[:format] = v.intern }
-parser.on('-o v', '--optional v',   /^fi$/)         {|v| opts[:fi] = true }
+parser.on('-o v', '--option v',     /^fi$/)         {|v| opts[:fi] = true }
 parser.on('-i v', '--include v',    /^ean14$/)      {|v| opts[:ean14] = true }
 parser.on('-t v', '--tag-suffix v', /^[A-z0-9]*$/i) {|v| opts[:tag_suffix] = v.upcase }
+parser.on('-x v', '--context v',    /^addr(ess)*$/i){|v| opts[:address] = true }
 #parser.on('--debug') {|v| opts[:debug] = true }
 parser.on_tail('-h', '--help') { puts help; exit }
 

data/lib/oddb2xml/builder.rb

@@ -20,7 +20,8 @@ module Oddb2xml
     attr_accessor :subject, :index, :items, :flags, :lppvs,
                   :actions, :migel, :orphans, :fridges,
                   :infos, :packs,
-                  :ean14, :tag_suffix
+                  :ean14, :tag_suffix,
+                  :companies, :people
     def initialize
       @subject    = nil
       @index      = {}
@@ -34,6 +35,8 @@ module Oddb2xml
       @orphans    = []
       @fridges    = []
       @ean14      = true
+      @companies  = {}
+      @people     = {}
       @tag_suffix = nil
       if block_given?
         yield self
@@ -766,6 +769,77 @@ module Oddb2xml
       end
       _builder.to_xml
     end
+    def build_company
+      _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        xml.doc.tag_suffix = @tag_suffix
+        datetime = Time.new.strftime('%FT%T.%7N%z')
+        xml.Betriebe(
+          'xmlns:xsd'         => 'http://www.w3.org/2001/XMLSchema',
+          'xmlns:xsi'         => 'http://www.w3.org/2001/XMLSchema-instance',
+          'xmlns'             => 'http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration',
+          'CREATION_DATETIME' => datetime,
+          'VALID_DATE'        => datetime,
+        ) {
+          @companies.each_pair do |ean, c|
+            xml.Betrieb('DT' => '') {
+              xml.GLN_Betrieb        ean unless ean.empty?
+              xml.Betriebsname_1     c[:name_1]  unless c[:name_1].empty?
+              xml.Betriebsname_2     c[:name_2]  unless c[:name_2].empty?
+              xml.Strasse            c[:address] unless c[:address].empty?
+              xml.Nummer             c[:number]  unless c[:number].empty?
+              xml.PLZ                c[:post]    unless c[:post].empty?
+              xml.Ort                c[:place]   unless c[:place].empty?
+              xml.Bewilligungskanton c[:region]  unless c[:region].empty?
+              xml.Land               c[:country] unless c[:country].empty?
+              xml.Betriebstyp        c[:type]    unless c[:type].empty?
+              xml.BTM_Berechtigung   c[:authorization] unless c[:authorization].empty?
+            }
+          end
+          xml.RESULT {
+            xml.OK_ERROR   'OK'
+            xml.NBR_RECORD @companies.values.length
+            xml.ERROR_CODE ''
+            xml.MESSAGE    ''
+          }
+        }
+      end
+      _builder.to_xml
+    end
+    def build_person
+      _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        xml.doc.tag_suffix = @tag_suffix
+        datetime = Time.new.strftime('%FT%T.%7N%z')
+        xml.Personen(
+          'xmlns:xsd'         => 'http://www.w3.org/2001/XMLSchema',
+          'xmlns:xsi'         => 'http://www.w3.org/2001/XMLSchema-instance',
+          'xmlns'             => 'http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration',
+          'CREATION_DATETIME' => datetime,
+          'VALID_DATE'        => datetime,
+        ) {
+          @people.each_pair do |ean, p|
+            xml.Person('DT' => '') {
+              xml.GLN_Person         ean unless ean.empty?
+              xml.Name               p[:last_name]     unless p[:last_name].empty?
+              xml.Vorname            p[:first_name]    unless p[:first_name].empty?
+              xml.PLZ                p[:post]          unless p[:post].empty?
+              xml.Ort                p[:place]         unless p[:place].empty?
+              xml.Bewilligungskanton p[:region]        unless p[:region].empty?
+              xml.Land               p[:country]       unless p[:country].empty?
+              xml.Bewilligung_Selbstdispensation p[:lincense] unless p[:license].empty?
+              xml.Diplom             p[:certificate]   unless p[:certificate].empty?
+              xml.BTM_Berechtigung   p[:authorization] unless p[:authorization].empty?
+            }
+          end
+          xml.RESULT {
+            xml.OK_ERROR   'OK'
+            xml.NBR_RECORD @people.values.length
+            xml.ERROR_CODE ''
+            xml.MESSAGE    ''
+          }
+        }
+      end
+      _builder.to_xml
+    end
 
     ### --- see oddb2tdat
     def format_price(price_str, len=6, int_len=4, frac_len=2)

data/lib/oddb2xml/cli.rb

@@ -15,6 +15,7 @@ module Oddb2xml
     def initialize(args)
       @options = args
       @mutex = Mutex.new
+      # product
       @items = {} # Items from Preparations.xml in BAG
       @index = {} # Base index from swissINDEX
       @flags = {} # narcotics flag files repo
@@ -25,6 +26,9 @@ module Oddb2xml
       @actions = [] # [addition] interactions from epha
       @orphans = [] # [addition] Orphaned drugs from Swissmedic xls
       @fridges = [] # [addition] ReFridge drugs from Swissmedic xls
+      # addres
+      @companies = {} # betrieb
+      @people    = {} # medizinalperson
       LANGUAGES.each do |lang|
         @index[lang] = {}
       end
@@ -32,25 +36,31 @@ module Oddb2xml
     end
     def run
       threads = []
-      if @options[:format] != :dat
-        if @options[:fi]
-          threads << download(:fachinfo) # swissmedic-info
+      if @options[:address]
+        [:company, :person].each do |type|
+          threads << download(type) # medregbm.admin
         end
-        [:orphan, :fridge].each do |type|
-          threads << download(type) # swissmedic
+      else
+        if @options[:format] != :dat
+          if @options[:fi]
+            threads << download(:fachinfo) # swissmedic-info
+          end
+          [:orphan, :fridge].each do |type|
+            threads << download(type) # swissmedic
+          end
+          threads << download(:interaction) # epha
         end
-        threads << download(:interaction) # epha
-      end
-      if @options[:nonpharma]
-        threads << download(:migel) # oddb2xml_files
-      end
-      threads << download(:package) # swissmedic
-      threads << download(:bm_update) # oddb2xml_files
-      threads << download(:lppv) # oddb2xml_files
-      threads << download(:bag) # bag.e-mediat
-      LANGUAGES.each do |lang|
-        types.each do |type|
-          threads << download(:index, type, lang) # swissindex
+        if @options[:nonpharma]
+          threads << download(:migel) # oddb2xml_files
+        end
+        threads << download(:package) # swissmedic
+        threads << download(:bm_update) # oddb2xml_files
+        threads << download(:lppv) # oddb2xml_files
+        threads << download(:bag) # bag.e-mediat
+        LANGUAGES.each do |lang|
+          types.each do |type|
+            threads << download(:index, type, lang) # swissindex
+          end
         end
       end
       begin
@@ -75,32 +85,38 @@ module Oddb2xml
       begin
         files.each_pair do |sbj, file|
           builder = Builder.new do |builder|
-            if @options[:format] != :dat
-              index = {}
-              LANGUAGES.each do |lang|
-                index[lang] = {} unless index[lang]
-                types.each do |type|
-                  index[lang].merge!(@index[lang][type]) if @index[lang][type]
+            if @options[:address]
+              builder.subject   = sbj
+              builder.companies = @companies
+              builder.people    = @people
+            else # product
+              if @options[:format] != :dat
+                index = {}
+                LANGUAGES.each do |lang|
+                  index[lang] = {} unless index[lang]
+                  types.each do |type|
+                    index[lang].merge!(@index[lang][type]) if @index[lang][type]
+                  end
                 end
+                builder.index = index
+                builder.subject = sbj
+              end
+              # common sources
+              builder.items = @items
+              builder.flags = @flags
+              builder.lppvs = @lppvs
+              # optional sources
+              builder.infos = @infos
+              builder.packs = @packs
+              # additional sources
+              %w[actions orphans fridges migel].each do |addition|
+                builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
               end
-              builder.index = index
-              builder.subject = sbj
-            end
-            # common sources
-            builder.items = @items
-            builder.flags = @flags
-            builder.lppvs = @lppvs
-            # optional sources
-            builder.infos = @infos
-            builder.packs = @packs
-            # additional sources
-            %w[actions orphans fridges migel].each do |addition|
-              builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
             end
             builder.tag_suffix = @options[:tag_suffix]
           end
           output = ''
-          if @options[:format] == :dat
+          if !@options[:address] and (@options[:format] == :dat)
             types.each do |type|
               index = {}
               LANGUAGES.each do |lang|
@@ -131,6 +147,16 @@ module Oddb2xml
     end
     def download(what, type=nil, lang=nil)
       case what
+      when :company, :person
+        var = (what == :company ? 'companies' : 'people')
+        Thread.new do
+          downloader = MedregbmDownloader.new(what)
+          str = downloader.download
+          self.instance_variable_set(
+            "@#{var}".intern,
+            MedregbmExtractor.new(str, what).to_hash
+          )
+        end
       when :fachinfo
         Thread.new do
           downloader = SwissmedicInfoDownloader.new
@@ -141,13 +167,13 @@ module Oddb2xml
           end
         end
       when :orphan, :fridge
-        type = (what.to_s + "s").intern
+        var = what.to_s + 's'
         Thread.new do
-          downloader = SwissmedicDownloader.new(type)
+          downloader = SwissmedicDownloader.new(what)
           bin = downloader.download
           self.instance_variable_set(
-            "@#{type.to_s}".intern,
-            SwissmedicExtractor.new(bin, type).to_arry
+            "@#{var}".intern,
+            SwissmedicExtractor.new(bin, what).to_arry
           )
         end
       when :interaction
@@ -168,10 +194,10 @@ module Oddb2xml
         end
       when :package
         Thread.new do
-          downloader = SwissmedicDownloader.new(:packages)
+          downloader = SwissmedicDownloader.new(:package)
           bin = downloader.download
           @mutex.synchronize do
-            @packs = SwissmedicExtractor.new(bin, :packages).to_hash
+            @packs = SwissmedicExtractor.new(bin, :package).to_hash
           end
         end
       when :bm_update
@@ -231,7 +257,10 @@ module Oddb2xml
     def files
       unless @_files
         @_files = {}
-        if @options[:format] == :dat
+        if @options[:address]
+          @_files[:company] = "#{prefix}_betrieb.xml"
+          @_files[:person]  = "#{prefix}_medizinalperson.xml"
+        elsif @options[:format] == :dat
           @_files[:dat] = "#{prefix}.dat"
           if @options[:nonpharma] # into one file
             @_files[:dat] = "#{prefix}_with_migel.dat"
@@ -255,18 +284,20 @@ module Oddb2xml
       @_prefix ||= (@options[:tag_suffix] || 'oddb').gsub(/^_|_$/, '').downcase
     end
     def report
-      lines = []
-      LANGUAGES.each do |lang|
-        lines << lang
-        types.each do |type|
-          key = (type == :nonpharma ? 'NonPharma' : 'Pharma')
-          if @index[lang][type]
-            lines << sprintf(
-              "\t#{key} products: %i", @index[lang][type].values.length)
+      unless @options[:address]
+        lines = []
+        LANGUAGES.each do |lang|
+          lines << lang
+          types.each do |type|
+            key = (type == :nonpharma ? 'NonPharma' : 'Pharma')
+            if @index[lang][type]
+              lines << sprintf(
+                "\t#{key} products: %i", @index[lang][type].values.length)
+            end
           end
         end
+        puts lines.join("\n")
       end
-      puts lines.join("\n")
     end
     def types # swissindex
       @_types ||=

data/lib/oddb2xml/downloader.rb

@@ -5,6 +5,25 @@ require 'zip/zip'
 require 'savon'
 
 module Oddb2xml
+  module DownloadMethod
+    private
+    def download_as(file, option='r')
+      begin
+        response = @agent.get(@url)
+        response.save_as(file)
+        response = nil # win
+        io = File.open(file, option)
+        return io.read
+      rescue Timeout::Error
+        retrievable? ? retry : raise
+      ensure
+        io.close if io and !io.closed? # win
+        if File.exists?(file)
+          File.unlink(file)
+        end
+      end
+    end
+  end
   class Downloader
     def initialize(options={}, url=nil)
       @options     = options
@@ -56,6 +75,53 @@ module Oddb2xml
       xml
     end
   end
+  class MigelDownloader < Downloader
+    include DownloadMethod
+    def download
+      @url ||= 'https://github.com/zdavatz/oddb2xml_files/raw/master/NON-Pharma.xls'
+      download_as('oddb2xml_files_nonpharma.xls', 'rb')
+    end
+  end
+  class EphaDownloader < Downloader
+    include DownloadMethod
+    def download
+      @url ||= 'http://community.epha.ch/interactions_de_utf8.csv'
+      download_as('epha_interactions.csv', 'r')
+    end
+  end
+  class BMUpdateDownloader < Downloader
+    include DownloadMethod
+    def download
+      @url ||= 'https://raw.github.com/zdavatz/oddb2xml_files/master/BM_Update.txt'
+      download_as('oddb2xml_files_bm_update.txt', 'r')
+    end
+  end
+  class LppvDownloader < Downloader
+    include DownloadMethod
+    def download
+      @url ||= 'https://raw.github.com/zdavatz/oddb2xml_files/master/LPPV.txt'
+      download_as('oddb2xml_files_lppv.txt', 'r')
+    end
+  end
+  class MedregbmDownloader < Downloader
+    include DownloadMethod
+    def initialize(type=:company)
+      @type = type
+      case @type
+      when :company # betrieb
+        action = 'CreateExcelListBetriebs'
+      when :person  # medizinalperson
+        action = 'CreateExcelListMedizinalPersons'
+      else
+        action = ''
+      end
+      url = "https://www.medregbm.admin.ch/Publikation/#{action}"
+      super({}, url)
+    end
+    def download
+      download_as("medregbm_#{@type.to_s}.txt", 'r:iso-8859-1:utf-8')
+    end
+  end
   class BagXmlDownloader < Downloader
     def init
       super
@@ -131,16 +197,16 @@ XML
     end
   end
   class SwissmedicDownloader < Downloader
-    def initialize(type=:orphans)
+    def initialize(type=:orphan)
       @type = type
       case @type
-      when :orphans
+      when :orphan
         action = "daten/00081/index.html?lang=de"
         @xpath = "//div[@id='sprungmarke0_4']//a[@title='Humanarzneimittel']"
-      when :fridges
+      when :fridge
         action = "daten/00080/00254/index.html?lang=de"
         @xpath = "//table[@class='swmTableFlex']//a[@title='B3.1.35-d.xls']"
-      when :packages
+      when :package
         action = "daten/00080/00251/index.html?lang=de"
         @xpath = "//div[@id='sprungmarke0_7']//a[@title='Excel-Version Zugelassene Verpackungen*']"
       end
@@ -169,29 +235,6 @@ XML
       end
     end
   end
-  class MigelDownloader < Downloader
-    def init
-      super
-      @url ||= 'https://github.com/zdavatz/oddb2xml_files/raw/master/NON-Pharma.xls'
-    end
-    def download
-      file = "oddb2xml_files_nonpharma.xls"
-      begin
-        response = @agent.get(@url)
-        response.save_as(file)
-        response = nil # win
-        io = File.open(file, 'rb')
-        return io.read
-      rescue Timeout::Error
-        retrievable? ? retry : raise
-      ensure
-        io.close if io and !io.closed? # win
-        if File.exists?(file)
-          File.unlink(file)
-        end
-      end
-    end
-  end
   class SwissmedicInfoDownloader < Downloader
     def init
       super
@@ -235,68 +278,4 @@ XML
       end
     end
   end
-  class EphaDownloader < Downloader
-    def init
-      super
-      @url ||= 'http://community.epha.ch/interactions_de_utf8.csv'
-    end
-    def download
-      file = "epha_interactions.csv"
-      begin
-        response = @agent.get(@url)
-        response.save_as(file)
-        response = nil # win
-        io = File.open(file, 'r')
-        return io.read
-      rescue Timeout::Error
-        retrievable? ? retry : raise
-      ensure
-        io.close if io and !io.closed? # win
-        if File.exists?(file)
-          File.unlink(file)
-        end
-      end
-    end
-  end
-  # txt filse
-  module TxtDownloadMethods
-    def download_as(file)
-      begin
-        response = @agent.get(@url)
-        response.save_as(file)
-        response = nil # win
-        io = File.open(file, 'r')
-        return io.read
-      rescue Timeout::Error
-        retrievable? ? retry : raise
-      ensure
-        io.close if io and !io.closed? # win
-        if File.exists?(file)
-          File.unlink(file)
-        end
-      end
-    end
-  end
-  class BMUpdateDownloader < Downloader
-    include TxtDownloadMethods
-    def init
-      super
-      @url ||= 'https://raw.github.com/zdavatz/oddb2xml_files/master/BM_Update.txt'
-    end
-    def download
-      file = 'oddb2xml_files_bm_update.txt'
-      download_as(file)
-    end
-  end
-  class LppvDownloader < Downloader
-    include TxtDownloadMethods
-    def init
-      super
-      @url ||= 'https://raw.github.com/zdavatz/oddb2xml_files/master/LPPV.txt'
-    end
-    def download
-      file = 'oddb2xml_files_lppv.txt'
-      download_as(file)
-    end
-  end
 end

data/lib/oddb2xml/extractor.rb

@@ -5,12 +5,32 @@ require 'spreadsheet'
 require 'stringio'
 
 module Oddb2xml
+  module TxtExtractorMethods
+    def initialize(str)
+      @io = StringIO.new(str)
+    end
+    def to_hash
+      data = {}
+      while line = @io.gets
+        next unless line =~ /\d{13}/
+        ean = line.chomp.gsub("\"", '')
+        data[ean] = true
+      end
+      data
+    end
+  end
   class Extractor
     attr_accessor :xml
     def initialize(xml)
       @xml = xml
     end
   end
+  class BMUpdateExtractor < Extractor
+    include TxtExtractorMethods
+  end
+  class LppvExtractor < Extractor
+    include TxtExtractorMethods
+  end
   class BagXmlExtractor < Extractor
     def to_hash
       data = {}
@@ -167,21 +187,21 @@ module Oddb2xml
   class SwissmedicExtractor < Extractor
     def initialize(bin, type)
       io = StringIO.new(bin)
-      book = Spreadsheet.open(io)
+      book = Spreadsheet.open(io, 'rb')
       @sheet = book.worksheet(0)
       @type  = type
     end
     def to_arry
       data = []
       case @type
-      when :orphans
+      when :orphan
         i = 1
         @sheet.each do |row|
           if number = extract_number(row, i)
             data << number.to_s
           end
         end
-      when :fridges
+      when :fridge
         i,c = 1,7
         @sheet.each do |row|
           if number = extract_number(row, i) and row[c] and row[c].to_s == 'x'
@@ -194,7 +214,7 @@ module Oddb2xml
     def to_hash # Packungen.xls
       data = {}
       case @type
-      when :packages
+      when :package
         typ = 6 # Heilmittelcode
         i_5,i_3 = 0,10 # :swissmedic_numbers
         cat     = 13   # :swissmedic_category
@@ -253,13 +273,13 @@ module Oddb2xml
   class MigelExtractor < Extractor
     def initialize(bin)
       io = StringIO.new(bin)
-      book = Spreadsheet.open(io)
+      book = Spreadsheet.open(io, 'rb')
       @sheet = book.worksheet(0)
     end
     def to_hash
       data = {}
       @sheet.each_with_index do |row, i|
-        next if i == 0
+        next if i.zero?
         phar = row[1].to_s
         data[phar] = {
           :ean             => row[0].to_i.to_s,
@@ -328,25 +348,53 @@ module Oddb2xml
       data
     end
   end
-  # txt files
-  module TxtMethods
-    def initialize(str)
-      @io = StringIO.new(str)
+  class MedregbmExtractor < Extractor
+    def initialize(str, type)
+      @io   = StringIO.new(str)
+      @type = type
     end
     def to_hash
       data = {}
-      while line = @io.gets
-        next unless line =~ /\d{13}/
-        ean = line.chomp.gsub("\"", '')
-        data[ean] = true
+      case @type
+      when :company
+        while line = @io.gets
+          row = line.chomp.split("\t")
+          next if row[0] =~ /^GLN/
+          gln = row[0].to_s
+          data[gln] = {
+            :gln     => gln,          #=> GLN Betrieb
+            :name_1  => row[1].to_s,  #=> Betriebsname 1
+            :name_2  => row[2].to_s,  #=> Betriebsname 2
+            :address => row[3].to_s,  #=> Strasse
+            :number  => row[4].to_s,  #=> Nummer
+            :post    => row[5].to_s,  #=> PLZ
+            :place   => row[6].to_s,  #=> Ort
+            :region  => row[7].to_s,  #=> Bewilligungskanton
+            :country => row[8].to_s,  #=> Land
+            :type    => row[9].to_s,  #=> Betriebstyp
+            :authorization => row[10].to_s, #=> BTM Berechtigung
+          }
+        end
+      when :person
+        while line = @io.gets
+          row = line.chomp.split("\t")
+          next if row[0] =~ /^GLN/
+          gln = row[0].to_s
+          data[gln] = {
+            :gln           => gln,         #=> GLN Person
+            :last_name     => row[1].to_s, #=> Name
+            :first_name    => row[2].to_s, #=> Vorname
+            :post          => row[3].to_s, #=> PLZ
+            :place         => row[4].to_s, #=> Ort
+            :region        => row[5].to_s, #=> Bewilligungskanton
+            :country       => row[6].to_s, #=> Land
+            :license       => row[7].to_s, #=> Bewilligung Selbstdispensation
+            :certificate   => row[8].to_s, #=> Diplom
+            :authorization => row[9].to_s, #=> BTM Berechtigung
+          }
+        end
       end
       data
     end
   end
-  class BMUpdateExtractor < Extractor
-    include TxtMethods
-  end
-  class LppvExtractor < Extractor
-    include TxtMethods
-  end
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 end

data/spec/cli_spec.rb

@@ -14,7 +14,7 @@ RSpec::Matchers.define :have_option do |option|
   end
 end
 
-shared_examples_for 'any interface' do
+shared_examples_for 'any interface for product' do
   it { cli.should respond_to(:run)  }
   it 'should run successfully' do
     $stdout.should_receive(:puts).with(/products/)
@@ -22,6 +22,14 @@ shared_examples_for 'any interface' do
   end
 end
 
+shared_examples_for 'any interface for address' do
+  it { cli.should respond_to(:run)  }
+  it 'should run successfully' do
+    $stdout.should_not_receive(:puts) # no output
+    cli.run
+  end
+end
+
 describe Oddb2xml::Cli do
   include ServerMockHelper
   before(:each) do
@@ -33,11 +41,12 @@ describe Oddb2xml::Cli do
         :compress_ext => 'tar.gz',
         :nonpharma    => false,
         :fi           => false,
+        :address      => false,
         :tag_suffix   => nil,
       }
       Oddb2xml::Cli.new(opts)
     end
-    it_behaves_like 'any interface'
+    it_behaves_like 'any interface for product'
     it 'should have compress option' do
       cli.should have_option(:compress_ext => 'tar.gz')
     end
@@ -66,11 +75,12 @@ describe Oddb2xml::Cli do
         :compress_ext => 'zip',
         :nonpharma    => false,
         :fi           => false,
+        :address      => false,
         :tag_suffix   => nil,
       }
       Oddb2xml::Cli.new(opts)
     end
-    it_behaves_like 'any interface'
+    it_behaves_like 'any interface for product'
     it 'should have compress option' do
       cli.should have_option(:compress_ext => 'zip')
     end
@@ -99,11 +109,12 @@ describe Oddb2xml::Cli do
         :compress_ext => nil,
         :nonpharma    => true,
         :fi           => false,
+        :address      => false,
         :tag_suffix   => nil,
       }
       Oddb2xml::Cli.new(opts)
     end
-    it_behaves_like 'any interface'
+    it_behaves_like 'any interface for product'
     it 'should have nonpharma option' do
       cli.should have_option(:nonpharma => true)
     end
@@ -140,11 +151,12 @@ describe Oddb2xml::Cli do
         :compress_ext => nil,
         :nonpharma    => false,
         :fi           => false,
+        :address      => false,
         :tag_suffix   => '_swiss'.upcase,
       }
       Oddb2xml::Cli.new(opts)
     end
-    it_behaves_like 'any interface'
+    it_behaves_like 'any interface for product'
     it 'should have tag_suffix option' do
       cli.should have_option(:tag_suffix=> '_SWISS')
     end
@@ -181,11 +193,12 @@ describe Oddb2xml::Cli do
         :compress_ext => nil,
         :nonpharma    => false,
         :fi           => true,
+        :address      => false,
         :tag_suffix   => nil,
       }
       Oddb2xml::Cli.new(opts)
     end
-    it_behaves_like 'any interface'
+    it_behaves_like 'any interface for product'
     it 'should have nonpharma option' do
       cli.should have_option(:fi => true)
     end
@@ -218,4 +231,40 @@ describe Oddb2xml::Cli do
       end
     end
   end
+  context 'when -x address option is given' do
+    let(:cli) do
+      opts = {
+        :compress_ext => nil,
+        :nonpharma    => false,
+        :fi           => false,
+        :address      => true,
+        :tag_suffix   => nil,
+      }
+      Oddb2xml::Cli.new(opts)
+    end
+    it_behaves_like 'any interface for address'
+    it 'should have address option' do
+      cli.should have_option(:address=> true)
+    end
+    it 'should not create any compressed file' do
+      cli.run
+      Dir.glob('oddb_*.tar.gz').first.should be_nil
+      Dir.glob('oddb_*.zip').first.should be_nil
+    end
+    it 'should create xml files' do
+      cli.run
+      expected = [
+        'oddb_betrieb.xml',
+        'oddb_medizinalperson.xml',
+      ].length
+      Dir.glob('oddb_*.xml').each do |file|
+        File.exists?(file).should be_true
+      end.to_a.length.should equal expected
+    end
+    after(:each) do
+      Dir.glob('oddb_*.xml').each do |file|
+        File.unlink(file) if File.exists?(file)
+      end
+    end
+  end
 end

data/spec/downloader_spec.rb

@@ -87,13 +87,13 @@ end
 
 describe Oddb2xml::SwissmedicDownloader do
   include ServerMockHelper
-  context 'orphans' do
+  context 'orphan' do
     before(:each) do
       setup_swissmedic_server_mock
-      @downloader = Oddb2xml::SwissmedicDownloader.new(:orphans)
+      @downloader = Oddb2xml::SwissmedicDownloader.new(:orphan)
     end
     it_behaves_like 'any downloader'
-    context 'download_by for orphans xls' do
+    context 'download_by for orphan xls' do
       let(:bin) { @downloader.download }
       it 'should return valid Binary-String' do
         bin.should be_a String
@@ -101,16 +101,16 @@ describe Oddb2xml::SwissmedicDownloader do
       end
       it 'should clean up current directory' do
         bin.should_not raise_error(Timeout::Error)
-        File.exist?('oddb_orphans.xls').should be(false)
+        File.exist?('oddb_orphan.xls').should be(false)
       end
     end
   end
-  context 'fridges' do
+  context 'fridge' do
     before(:each) do
       setup_swissmedic_server_mock
-      @downloader = Oddb2xml::SwissmedicDownloader.new(:fridges)
+      @downloader = Oddb2xml::SwissmedicDownloader.new(:fridge)
     end
-    context 'download_by for fridges xls' do
+    context 'download_by for fridge xls' do
       let(:bin) { @downloader.download }
       it 'should return valid Binary-String' do
         bin.should be_a String
@@ -118,16 +118,16 @@ describe Oddb2xml::SwissmedicDownloader do
       end
       it 'should clean up current directory' do
         bin.should_not raise_error(Timeout::Error)
-        File.exist?('oddb_fridges.xls').should be(false)
+        File.exist?('oddb_fridge.xls').should be(false)
       end
     end
   end
-  context 'packages' do
+  context 'package' do
     before(:each) do
       setup_swissmedic_server_mock
-      @downloader = Oddb2xml::SwissmedicDownloader.new(:packages)
+      @downloader = Oddb2xml::SwissmedicDownloader.new(:package)
     end
-    context 'download_by for packages xls' do
+    context 'download_by for package xls' do
       let(:bin) { @downloader.download }
       it 'should return valid Binary-String' do
         bin.should be_a String
@@ -135,7 +135,7 @@ describe Oddb2xml::SwissmedicDownloader do
       end
       it 'should clean up current directory' do
         bin.should_not raise_error(Timeout::Error)
-        File.exist?('oddb_packages.xls').should be(false)
+        File.exist?('oddb_package.xls').should be(false)
       end
     end
   end
@@ -245,3 +245,42 @@ describe Oddb2xml::MigelDownloader do
     end
   end
 end
+
+describe Oddb2xml::MedregbmDownloader do
+  include ServerMockHelper
+  context 'betrieb' do
+    before(:each) do
+      setup_medregbm_server_mock
+      @downloader = Oddb2xml::MedregbmDownloader.new(:company)
+    end
+    it_behaves_like 'any downloader'
+    context 'download betrieb txt' do
+      let(:txt) { @downloader.download }
+      it 'should return valid String' do
+        txt.should be_a String
+        txt.bytes.should_not nil
+      end
+      it 'should clean up current directory' do
+        txt.should_not raise_error(Timeout::Error)
+        File.exist?('oddb_company.xls').should be(false)
+      end
+    end
+  end
+  context 'person' do
+    before(:each) do
+      setup_medregbm_server_mock
+      @downloader = Oddb2xml::MedregbmDownloader.new(:person)
+    end
+    context 'download person txt' do
+      let(:txt) { @downloader.download }
+      it 'should return valid String' do
+        txt.should be_a String
+        txt.bytes.should_not nil
+      end
+      it 'should clean up current directory' do
+        txt.should_not raise_error(Timeout::Error)
+        File.exist?('oddb_person.xls').should be(false)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -25,6 +25,7 @@ module ServerMockHelper
     setup_bm_update_server_mock
     setup_lppv_server_mock
     setup_migel_server_mock
+    setup_medregbm_server_mock
   end
   def setup_bag_xml_server_mock
     # zip
@@ -199,6 +200,32 @@ module ServerMockHelper
         :headers => {'Content-Type' => 'application/octet-stream; charset=utf-8'},
         :body    => stub_response)
   end
+  def setup_medregbm_server_mock
+    # txt betrieb
+    stub_txt_url = 'https://www.medregbm.admin.ch/Publikation/CreateExcelListBetriebs'
+    stub_response = File.read(File.expand_path('../data/medregbm_betrieb.txt', __FILE__))
+    stub_request(:get, stub_txt_url).
+      with(:headers => {
+        'Accept' => '*/*',
+        'Host'   => 'www.medregbm.admin.ch',
+      }).
+      to_return(
+        :status  => 200,
+        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
+        :body    => stub_response)
+    stub_txt_url = 'https://www.medregbm.admin.ch/Publikation/CreateExcelListMedizinalPersons'
+    # txt person
+    stub_response = File.read(File.expand_path('../data/medregbm_person.txt', __FILE__))
+    stub_request(:get, stub_txt_url).
+      with(:headers => {
+        'Accept' => '*/*',
+        'Host'   => 'www.medregbm.admin.ch',
+      }).
+      to_return(
+        :status  => 200,
+        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
+        :body    => stub_response)
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &17599500 !ruby/object:Gem::Requirement
+  requirement: &19384600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17599500
+  version_requirements: *19384600
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &17598980 !ruby/object:Gem::Requirement
+  requirement: &19384140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17598980
+  version_requirements: *19384140
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &17598420 !ruby/object:Gem::Requirement
+  requirement: &19383700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17598420
+  version_requirements: *19383700
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &17597680 !ruby/object:Gem::Requirement
+  requirement: &19383200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17597680
+  version_requirements: *19383200
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &17596580 !ruby/object:Gem::Requirement
+  requirement: &19382620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17596580
+  version_requirements: *19382620
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &17596100 !ruby/object:Gem::Requirement
+  requirement: &19255580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17596100
+  version_requirements: *19255580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17595560 !ruby/object:Gem::Requirement
+  requirement: &19254720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17595560
+  version_requirements: *19254720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &17594800 !ruby/object:Gem::Requirement
+  requirement: &19253480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17594800
+  version_requirements: *19253480
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &17593260 !ruby/object:Gem::Requirement
+  requirement: &19252640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17593260
+  version_requirements: *19252640
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17590480 !ruby/object:Gem::Requirement
+  requirement: &19251860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *17590480
+  version_requirements: *19251860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17554860 !ruby/object:Gem::Requirement
+  requirement: &19250720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17554860
+  version_requirements: *19250720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17553900 !ruby/object:Gem::Requirement
+  requirement: &19247520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *17553900
+  version_requirements: *19247520
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17553160 !ruby/object:Gem::Requirement
+  requirement: &19246620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *17553160
+  version_requirements: *19246620
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables:
@@ -184,15 +184,17 @@ files:
 - spec/compressor_spec.rb
 - spec/data/XMLPublications.zip
 - spec/data/epha_interactions.csv
+- spec/data/medregbm_betrieb.txt
+- spec/data/medregbm_person.txt
 - spec/data/oddb2xml_files_bm_update.txt
 - spec/data/oddb2xml_files_lppv.txt
+- spec/data/oddb2xml_files_nonpharma.xls
 - spec/data/oddb_article.xml
 - spec/data/oddb_fi.xml
 - spec/data/oddb_fi_product.xml
 - spec/data/oddb_limitation.xml
 - spec/data/oddb_product.xml
 - spec/data/oddb_substance.xml
-- spec/data/oddb2xml_files_nonpharma.xls
 - spec/data/swissindex.xml
 - spec/data/swissindex_nonpharma.xml
 - spec/data/swissindex_pharma.xml