oddb2xml 1.0.8 → 1.0.9

data/History.txt

@@ -1,4 +1,8 @@
-=== 1.0.7 / 20.11.2012
+=== 1.0.9 / 11.12.2012
+
+* Added Substance Updater via BAG-XML from the Substance Branch.
+
+=== 1.0.8 / 20.11.2012
 
 * Update spec for cli
 * Add zip compress option

data/lib/oddb2xml/builder.rb

@@ -27,12 +27,53 @@ module Oddb2xml
         yield self
       end
     end
-    def to_xml
-      if @subject
+    def to_xml(subject=nil)
+      if subject
+        self.send('build_' + subject)
+      elsif @subject
         self.send('build_' + @subject)
       end
     end
     private
+    def build_substance
+      @substances = []
+      @items.values.uniq.each do |seq|
+        seq[:substances].each do |sub|
+          @substances << sub[:name]
+        end
+      end
+      @substances.uniq!
+      @substances.sort!
+      _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.SUBSTANCE(
+          '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,
+          'PROD_DATE'         => datetime,
+          'VALID_DATE'        => datetime,
+        ) {
+          @substances.each_with_index do |sub_name, i|
+            xml.SB('DT' => '') {
+              xml.SUBNO (i + 1).to_i
+              #xml.NAMD
+              #xml.ANAMD
+              #xml.NAMF
+              xml.NAML sub_name
+            }
+          end
+          xml.RESULT {
+            xml.OK_ERROR   'OK'
+            xml.NBR_RECORD @substances.length.to_s
+            xml.ERROR_CODE ''
+            xml.MESSAGE    ''
+          }
+        }
+      end
+      _builder.to_xml
+    end
     def build_product
       # merge company info from swissINDEX
       objects = []
@@ -137,7 +178,7 @@ module Oddb2xml
                 seq[:substances].each do |sub|
                   xml.CPTCMP {
                     xml.LINE  sub[:index]    unless sub[:index].empty?
-                    #xml.SUBNO
+                    xml.SUBNO @substances.index(sub[:name]) + 1 if @substances.include?(sub[:name])
                     xml.QTY   sub[:quantity] unless sub[:quantity].empty?
                     xml.QTYU  sub[:unit]     unless sub[:unit].empty?
                     #xml.WHK

data/lib/oddb2xml/cli.rb

@@ -12,7 +12,7 @@ module Oddb2xml
     LANGUAGES = %w[DE FR] # EN does not exist
     def initialize(args)
       @options = args
-      #@mutex = Mutex.new
+      @mutex = Mutex.new
       @items = {} # Items from Preparations.xml in BAG
       @index = {} # Base index from swissINDEX
       LANGUAGES.each do |lang|
@@ -20,28 +20,27 @@ module Oddb2xml
       end
     end
     def run
-      # Sometimes nokogiri crashes with ruby in Threads.
-      #threads = []
+      threads = []
       # bag_xml
-      #threads << Thread.new do
+      threads << Thread.new do
         downloader = BagXmlDownloader.new
         xml = downloader.download
         @items = BagXmlExtractor.new(xml).to_hash
-      #end
+      end
       LANGUAGES.each do |lang|
         # swissindex
         types.each do |type|
-          #threads << Thread.new do
+          threads << Thread.new do
             downloader = SwissIndexDownloader.new(type)
             xml = downloader.download_by(lang)
-            hsh = SwissIndexExtractor.new(xml, type).to_hash
-            #@mutex.synchronize do
+            @mutex.synchronize do
+              hsh = SwissIndexExtractor.new(xml, type).to_hash
               @index[lang][type] = hsh
-            #end
-          #end
+            end
+          end
         end
       end
-      #threads.map(&:join)
+      threads.map(&:join)
       build
       report
     end
@@ -65,12 +64,19 @@ module Oddb2xml
             builder.items      = @items
             builder.tag_suffix = @options[:tag_suffix]
           end
+          if file =~ /(product)/
+            xml = builder.to_xml('substance')
+            File.open(file.gsub($1, 'substance'), 'w:utf-8'){ |fh| fh << xml }
+          end
           xml = builder.to_xml
           File.open(file, 'w:utf-8'){ |fh| fh << xml }
         end
         if @options[:compress_ext]
           compressor = Compressor.new(prefix, @options[:compress_ext])
           files.values.each do |file|
+            if file =~ /(product)/
+              compressor.contents << file.gsub($1, 'substance')
+            end
             compressor.contents << file
           end
           compressor.finalize!

data/lib/oddb2xml/compressor.rb

@@ -14,7 +14,7 @@ module Oddb2xml
       super()
     end
     def finalize!
-      unless @contents.select{ |file| File.exists?(file) }.length == 2
+      unless @contents.select{ |file| File.exists?(file) }.length == 3
         return false
       end
       begin

data/lib/oddb2xml/extractor.rb

@@ -11,8 +11,6 @@ module Oddb2xml
   end
   class BagXmlExtractor < Extractor
     def to_hash
-      #File.open('../bagxml.xml', 'r:ASCII-8BIT') {|f| @xml = f.read }
-      # pharmacode => sequence
       data = {}
       doc = Nokogiri::XML(@xml)
       doc.xpath('//Preparation').each do |seq|
@@ -38,8 +36,9 @@ module Oddb2xml
         seq.xpath('.//Substance').each_with_index do |sub, i|
           item[:substances] << {
             :index    => i.to_s,
-            :quantity => (qtty = sub.at_xpath('.//Quantity'))     ? qtty.text : '',
-            :unit     => (unit = sub.at_xpath('.//QuantityUnit')) ? unit.text : '',
+            :name     => (name = sub.at_xpath('.//DescriptionLa')) ? name.text : '',
+            :quantity => (qtty = sub.at_xpath('.//Quantity'))      ? qtty.text : '',
+            :unit     => (unit = sub.at_xpath('.//QuantityUnit'))  ? unit.text : '',
           }
         end
         item[:pharmacodes] = []
@@ -93,8 +92,6 @@ module Oddb2xml
       super(xml)
     end
     def to_hash
-      #File.open("../swissindex_#{@type.downcase}.xml", 'r:ASCII-8BIT'){|f| @xml = f.read }
-      # pharmacode => package
       data = {}
       doc = Nokogiri::XML(@xml)
       doc.remove_namespaces!

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,48 +1,63 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oddb2xml
-version: !ruby/object:Gem::Version
-  version: 1.0.8
+version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 9
+  version: 1.0.9
 platform: ruby
-authors:
+authors: 
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &17164840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  prerelease: false
-  version_requirements: *17164840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &17164160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
   type: :development
-  prerelease: false
-  version_requirements: *17164160
-description: ''
-email:
+  version_requirements: *id002
+description: ""
+email: 
 - yasaka@ywesee.com,  zdavatz@ywesee.com
-executables:
+executables: 
 - oddb2xml
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-files:
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -73,28 +88,37 @@ files:
 - spec/spec_helper.rb
 homepage: 
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.txt
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: oddb2xml
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: ''
+summary: ""
 test_files: []
+