oddb2xml 1.1.9 → 1.2.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.2.0 / 22.01.2013
+
+* Add dat format output
+* Update file deletion on Windows
+
 === 1.1.9 / 17.01.2013
 
 * Improve SSLv3 Error message output

data/bin/oddb2xml

@@ -13,8 +13,10 @@ def help
 #$0 ver.#{Oddb2xml::VERSION}
 Usage:
   oddb2xml [option]
-    -c F, --compress=F   Compress format F. {tar.gz|zip}
     -a T, --append=T     Additional target. T, only 'nonpharma' is available.
+    -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.
     -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.
@@ -24,15 +26,20 @@ end
 
 parser = OptionParser.new
 opts = {
-  :compress_ext => nil,
   :nonpharma    => false,
+  :compress_ext => nil,
+  :format       => :xml,
+  :fi           => false,
   :tag_suffix   => nil,
+  :debug        => false,
 }
 
-parser.on('-c v', '--compress v',   /tar\.gz|zip/)   {|v| opts[:compress_ext] = v }
 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',     /dat/)           {|v| opts[:format] = :dat }
 parser.on('-o v', '--optional v',   /fi/)            {|v| opts[:fi] = true }
 parser.on('-t v', '--tag-suffix v', /^[A-z0-9_]*$/i) {|v| opts[:tag_suffix] = v.upcase }
+#parser.on('--debug') {|v| opts[:debug] = true }
 parser.on_tail('-h', '--help') { puts help; exit }
 
 args = ARGV.dup
@@ -47,6 +54,7 @@ end
 
 ui = Oddb2xml::Cli.new(opts)
 begin
+  #puts opts if opts[:debug]
   ui.run
 rescue Interrupt
   puts

data/lib/oddb2xml/builder.rb

@@ -38,9 +38,16 @@ module Oddb2xml
     end
     def to_xml(subject=nil)
       if subject
-        self.send('build_' + subject)
+        self.send('build_' + subject.to_s)
       elsif @subject
-        self.send('build_' + @subject)
+        self.send('build_' + @subject.to_s)
+      end
+    end
+    def to_dat(subject=nil)
+      if subject
+        self.send('build_' + subject.to_s)
+      elsif @subject
+        self.send('build_' + @subject.to_s)
       end
     end
     private
@@ -679,5 +686,87 @@ module Oddb2xml
       end
       _builder.to_xml
     end
+
+    ### --- see oddb2tdat
+    def format_price(price_str, len=6, int_len=4, frac_len=2)
+      price = price_str.split('.')
+      pre = ''
+      las = ''
+      pre = "%0#{int_len}d" % (price[0] ? price[0] : '0')
+      las = if price[1]
+              if price[1].size < frac_len
+                price[1] + "0"*(frac_len-price[2].to_s.size)
+              else
+                price[1][0,frac_len]
+              end
+            else
+              '0'*frac_len
+            end
+      (pre.to_s + las.to_s)[0,len]
+    end
+    def format_date(date_str, len=7)
+      date = date_str.gsub('.','')
+      if date.size < len
+        date = date + '0'*(len-date.size)
+      end
+      date[0,len]
+    end
+    DAT_LEN = {
+      :RECA =>  2,
+      :CMUT =>  1,
+      :PHAR =>  7,
+      :ABEZ => 50,
+      :PRMO =>  6,
+      :PRPU =>  6,
+      :CKZL =>  1,
+      :CLAG =>  1,
+      :CBGG =>  1,
+      :CIKS =>  1,
+      :ITHE =>  7,
+      :CEAN => 13,
+      :CMWS =>  1,
+    }
+    def build_dat
+      prepare_articles
+      rows = []
+      @articles.each do |obj|
+        row = ''
+        de_pac = obj[:de]
+        fr_pac = obj[:fr]
+        # Oddb2tdat.parse
+        if obj[:de][:status] =~ /A|I/
+          bg_pac = nil
+          if obj[:seq]
+            pac = obj[:seq][:packages][de_pac[:pharmacode]]
+            row << "%#{DAT_LEN[:RECA]}s"  % '11'
+            row << "%#{DAT_LEN[:CMUT]}s"  % if (phar = pac[:pharmacode] and phar.size > 3) # does not check expiration_date
+                                              obj[:de][:status] == "I" ? '3' : '1'
+                                            else
+                                              '3'
+                                            end
+            row << "%0#{DAT_LEN[:PHAR]}d" % pac[:pharmacode].to_i
+            row << "%-#{DAT_LEN[:ABEZ]}s" % (de_pac[:desc].to_s.gsub(/"/, '') + " " + pac[:name_de].to_s).to_s[0, DAT_LEN[:ABEZ]].gsub(/"/, '')
+            row << "%#{DAT_LEN[:PRMO]}s"  % format_price(pac[:prices][:exf_price][:price].to_s)
+            row << "%#{DAT_LEN[:PRPU]}s"  % format_price(pac[:prices][:pub_price][:price].to_s)
+            row << "%#{DAT_LEN[:CKZL]}s"  % '3' # sl_entry and lppv
+            row << "%#{DAT_LEN[:CLAG]}s"  % '0'
+            row << "%#{DAT_LEN[:CBGG]}s"  % (pac[:narcosis_flag] == 'Y' ? '1' : '0')
+            row << "%#{DAT_LEN[:CIKS]}s"  % if (pac[:swissmedic_category] =~ /^[ABCDE]$/)
+                                              pac[:swissmedic_category].gsub(/(\+|\s)/, '')
+                                            else
+                                              '0'
+                                            end
+            row << "%#{DAT_LEN[:ITHE]}s"  % '       ' # ith_swissmedic
+            row << "%#{DAT_LEN[:CEAN]}s"  % de_pac[:ean].to_s
+            row << "%#{DAT_LEN[:CMWS]}s"  % '2'
+            rows << row
+          end
+        end
+      end
+      rows.join("\n")
+    end
+    def build_with_migel_dat
+      ''
+    end
   end
 end

data/lib/oddb2xml/cli.rb

@@ -29,35 +29,37 @@ module Oddb2xml
     def run
       threads = []
       # swissmedic-info
-      if @options[:fi]
-        threads << Thread.new do
-          downloader = SwissmedicInfoDownloader.new
-          xml = downloader.download
-          @mutex.synchronize do
-            hsh = SwissmedicInfoExtractor.new(xml).to_hash
-            @infos = hsh
+      if @options[:format] != :dat
+        if @options[:fi]
+          threads << Thread.new do
+            downloader = SwissmedicInfoDownloader.new
+            xml = downloader.download
+            @mutex.synchronize do
+              hsh = SwissmedicInfoExtractor.new(xml).to_hash
+              @infos = hsh
+            end
           end
         end
-      end
-      # swissmedic
-      [:orphans, :fridges].each do |type|
-        threads << Thread.new do
-          downloader = SwissmedicDownloader.new(type)
-          bin = downloader.download
-          self.instance_variable_set("@#{type.to_s}", SwissmedicExtractor.new(bin, type).to_arry)
+        # swissmedic
+        [:orphans, :fridges].each do |type|
+          threads << Thread.new do
+            downloader = SwissmedicDownloader.new(type)
+            bin = downloader.download
+            self.instance_variable_set("@#{type.to_s}", SwissmedicExtractor.new(bin, type).to_arry)
+          end
         end
-      end
-      # epha
-      threads << Thread.new do
-        downloader = EphaDownloader.new
-        str = downloader.download
-        @mutex.synchronize do
-          @actions = EphaExtractor.new(str).to_arry
+        # epha
+        threads << Thread.new do
+          downloader = EphaDownloader.new
+          str = downloader.download
+          @mutex.synchronize do
+            @actions = EphaExtractor.new(str).to_arry
+          end
         end
       end
       # bag
       threads << Thread.new do
-        downloader = BagXmlDownloader.new
+        downloader = BagXmlDownloader.new(@options)
         xml = downloader.download
         @mutex.synchronize do
           hsh = BagXmlExtractor.new(xml).to_hash
@@ -77,7 +79,7 @@ module Oddb2xml
         # swissindex
         types.each do |type|
           threads << Thread.new do
-            downloader = SwissIndexDownloader.new(type, lang)
+            downloader = SwissIndexDownloader.new(@options, type, lang)
             begin
               xml = downloader.download
             rescue SystemExit
@@ -120,8 +122,15 @@ module Oddb2xml
             index = {}
             LANGUAGES.each do |lang|
               index[lang] = {} unless index[lang]
-              types.each do |type|
-                index[lang].merge!(@index[lang][type]) if @index[lang][type]
+              # TODO
+              #   to fix @index structure
+              if @options[:format] == :dat
+                type = (sbj == :dat ? :pharma : :nonpharma)
+                index[lang] = @index[lang][type]
+              else
+                types.each do |type|
+                  index[lang].merge!(@index[lang][type]) if @index[lang][type]
+                end
               end
             end
             builder.subject = sbj
@@ -136,8 +145,13 @@ module Oddb2xml
             builder.infos = @infos
             builder.tag_suffix = @options[:tag_suffix]
           end
-          xml = builder.to_xml
-          File.open(file, 'w:utf-8'){ |fh| fh << xml }
+          output = ''
+          if @options[:format] == :dat
+            output = builder.to_dat
+          else
+            output = builder.to_xml
+          end
+          File.open(file, 'w:utf-8'){ |fh| fh << output }
         end
       rescue Interrupt
         files.values.each do |file|
@@ -160,15 +174,22 @@ module Oddb2xml
     def files
       unless @_files
         @_files = {}
-        ##
-        # building order
-        #   1. addtions
-        #   2. subjects
-        #   3. optionals
-        _files = (ADDITIONS + SUBJECTS)
-        _files += OPTIONALS if @options[:fi]
-        _files.each do|sbj|
-          @_files[sbj] = "#{prefix}_#{sbj.to_s}.xml"
+        if @options[:format] == :dat
+          @_files[:dat] = "#{prefix}.dat"
+          if @options[:nonpharma]
+            @_files[:with_migel_dat] = "#{prefix}_with_migel.dat"
+          end
+        else # xml
+          ##
+          # building order
+          #   1. addtions
+          #   2. subjects
+          #   3. optionals
+          _files = (ADDITIONS + SUBJECTS)
+          _files += OPTIONALS if @options[:fi]
+          _files.each do|sbj|
+            @_files[sbj] = "#{prefix}_#{sbj.to_s}.xml"
+          end
         end
       end
       @_files

data/lib/oddb2xml/downloader.rb

@@ -6,7 +6,8 @@ require 'savon'
 
 module Oddb2xml
   class Downloader
-    def initialize(url=nil)
+    def initialize(options={}, url=nil)
+      @options     = options
       @url         = url
       @retry_times = 3
       HTTPI.log = false # disable httpi warning
@@ -31,18 +32,21 @@ module Oddb2xml
     end
     def read_xml_form_zip(target, zipfile)
       xml = ''
-      if RUBY_PLATFORM =~ /mswin|mingw|bccwin|cygwin/i # for memory error
-        Zip::ZipFile.foreach(zipfile) do |entry|
-          if entry.name =~ target
-            io = entry.get_input_stream
-            until io.eof?
-              bytes = io.read(1024)
-              xml << bytes
-              bytes = nil
+      if RUBY_PLATFORM =~ /mswin|mingw|bccwin|cygwin/i
+        zip = ZipFile.open(zipfile) do |zipFile|
+          zipFile.each do |entry|
+            if entry.name =~ target
+              io = entry.get_input_stream
+              until io.eof?
+                bytes = io.read(1024)
+                xml << bytes
+                bytes = nil
+              end
+              io.close
             end
-            io.close
           end
         end
+        zip.close
       else
         Zip::ZipFile.foreach(zipfile) do |entry|
           if entry.name =~ target
@@ -61,9 +65,13 @@ module Oddb2xml
     def download
       file = 'XMLPublications.zip'
       begin
-        response = @agent.get(@url)
-        response.save_as(file)
-        response = nil # win
+        if @options[:debug]
+          FileUtils.copy(File.expand_path("../../../spec/data/#{file}", __FILE__), '.')
+        else
+          response = @agent.get(@url)
+          response.save_as(file)
+          response = nil # win
+        end
         return read_xml_form_zip(/^Preparation/iu, file)
       rescue Timeout::Error
         retrievable? ? retry : raise
@@ -75,11 +83,11 @@ module Oddb2xml
     end
   end
   class SwissIndexDownloader < Downloader
-    def initialize(type=:pharma, lang='DE')
+    def initialize(options={}, type=:pharma, lang='DE')
       @type = (type == :pharma ? 'Pharma' : 'NonPharma')
       @lang = lang
       url = "https://index.ws.e-mediat.net/Swissindex/#{@type}/ws_#{@type}_V101.asmx?WSDL"
-      super(url)
+      super(options, url)
     end
     def init
       config = {
@@ -93,6 +101,9 @@ module Oddb2xml
     end
     def download
       begin
+        if @options[:debug]
+          return File.read(File.expand_path("../../../spec/data/swissindex_#{@type}_#{@lang}.xml", __FILE__))
+        end
         soap = <<XML
 <?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
@@ -132,7 +143,7 @@ XML
         @xpath = "//table[@class='swmTableFlex']//a[@title='B3.1.35-d.xls']"
       end
       url = "http://www.swissmedic.ch/#{action}"
-      super(url)
+      super({}, url)
     end
     def download
       file = "swissmedic_#{@type}.xls"
@@ -177,16 +188,24 @@ XML
         end
         if response
           response.save_as(file)
-          response = nil # msmin
+          response = nil # win
         end
         return read_xml_form_zip(/^AipsDownload_/iu, file)
       rescue Timeout::Error
         retrievable? ? retry : raise
-      rescue NoMethodError => e
+      rescue NoMethodError
         # pass
       ensure
+        # win
+        deleted = false
         if File.exists?(file)
-          File.unlink(file)
+          until deleted
+            begin
+              File.unlink(file)
+              deleted = true
+            rescue Errno::EACCES # Permission Denied on Windows
+            end
+          end
         end
       end
     end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.1.9"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &16175640 !ruby/object:Gem::Requirement
+  requirement: &5831820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16175640
+  version_requirements: *5831820
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &16175000 !ruby/object:Gem::Requirement
+  requirement: &5829360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16175000
+  version_requirements: *5829360
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &16174300 !ruby/object:Gem::Requirement
+  requirement: &5828680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16174300
+  version_requirements: *5828680
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &16173840 !ruby/object:Gem::Requirement
+  requirement: &5826640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16173840
+  version_requirements: *5826640
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &16173260 !ruby/object:Gem::Requirement
+  requirement: &5826160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16173260
+  version_requirements: *5826160
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &16172800 !ruby/object:Gem::Requirement
+  requirement: &5825740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16172800
+  version_requirements: *5825740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16188540 !ruby/object:Gem::Requirement
+  requirement: &5825200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16188540
+  version_requirements: *5825200
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &16188000 !ruby/object:Gem::Requirement
+  requirement: &5841140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16188000
+  version_requirements: *5841140
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &16187540 !ruby/object:Gem::Requirement
+  requirement: &5840660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16187540
+  version_requirements: *5840660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &16186660 !ruby/object:Gem::Requirement
+  requirement: &5840080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *16186660
+  version_requirements: *5840080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16185900 !ruby/object:Gem::Requirement
+  requirement: &5839480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16185900
+  version_requirements: *5839480
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16185020 !ruby/object:Gem::Requirement
+  requirement: &5838700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *16185020
+  version_requirements: *5838700
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &16184500 !ruby/object:Gem::Requirement
+  requirement: &5838200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *16184500
+  version_requirements: *5838200
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: