oddb2xml 1.9.7 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cead671c938149dab5dfde7f418a9cc2fdd5d62
-  data.tar.gz: 1ae54ff9d2724b4675b2f9a7e2a345a20f9017b6
+  metadata.gz: 721c2d137c7dbaaed24ff52acfe254adc280b954
+  data.tar.gz: 67e7cc0025f8e76d9e6ae64d9877055f4c0d4788
 SHA512:
-  metadata.gz: fc4db40f9ede22f2f48dc3159eff3d93f5fbae6c46f7a4ab0fc466c4ecc8d142c4e8e41d9395effac0bfe79c5c6e34553d87ed2b171fb16287a63c8b21c3dce9
-  data.tar.gz: b784b7ea2ae441c6869a514729b2663a1939022c2f2d841b3a2e87bc9bdf70d46892cf95eb8b815d2f51cb0148efac31ec38995d302155959c483f538673fa96
+  metadata.gz: 0debbdf566d2180e15c345a1b7d7faa3fdf4013a8ada0204bc01d92a29a5d246fd53f3a9288cc50c44a36373d69a4412b7447129b9a99f7e495ce115b3368f6b
+  data.tar.gz: 5f75349fbf9ec7bd2b05cc6e6fec4c1efd0028210a9e49497813edc44f701dbf5cc274bd0c95c4ac2b3531927be9533f9fd072de2697a5ec6ed9e6c49fc911b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (1.9.7)
+    oddb2xml (1.9.8)
       archive-tar-minitar (~> 0.5.2)
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)
@@ -75,11 +75,11 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     ruby-ole (1.2.11.8)
-    rubyXL (3.3.3)
+    rubyXL (3.3.6)
       nokogiri (>= 1.4.4)
       rubyzip (>= 1.1.6)
     rubyntlm (0.3.4)
-    rubyzip (1.1.6)
+    rubyzip (1.1.7)
     safe_yaml (1.0.4)
     savon (2.4.0)
       akami (~> 1.2.0)

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.9.8 / 04.03.2015
+
+* Remove unnecessary spaces from ARTICLE.GALENIC_FORM in oddb_calc.xml
+* Remove unnecessary spaces from ARTICLE.PKG_SIZE in oddb_calc.xml
+* Remove unnecessary spaces from ARTICLE.NAME in oddb_calc.xml
+* Emit comment for compositions, eg. 'Solvens: aqua ad iniectabilia.'
+* Renamed COMPOSITION to COMPONENT in COMPOSITIONS
+
 === 1.9.7 / 03.03.2015
 
 * Emit qty as floats

data/lib/oddb2xml/builder.rb

@@ -665,8 +665,8 @@ module Oddb2xml
             items[ean13] = info
             xml.ARTICLE {
               xml.GTIN          ean13
-              xml.NAME          name
-              xml.PKG_SIZE      package_size
+              xml.NAME          info.name
+              xml.PKG_SIZE      info.pkg_size
               xml.SELLING_UNITS info.selling_units
 #              xml.COUNT         info.count
 #              xml.MULTI         info.multi
@@ -683,14 +683,16 @@ module Oddb2xml
               xml.COMPOSITIONS {
                 info.compositions.each {
                   |composition|
-                  xml.COMPOSITION {
+                  xml.COMPONENT {
                                     xml.NAME composition.name
                                     if composition.unit
                                       xml.QTY  composition.qty
                                       xml.UNIT composition.unit
                                     end
+                                    xml.LABEL composition.label if composition.label
                                   }
                   }
+                xml.COMMENT info.composition_comment if info.composition_comment
               }
             } if info.compositions
           end

data/lib/oddb2xml/calc.rb

@@ -6,7 +6,7 @@ require 'yaml'
 module Oddb2xml
  # Calc is responsible for analysing the columns "Packungsgrösse" and "Einheit"
  #
-  Composition   = Struct.new("Composition",  :name, :qty, :unit)
+  Composition   = Struct.new("Composition",  :name, :qty, :unit, :label)
   GalenicGroup  = Struct.new("GalenicGroup", :oid, :descriptions)
   GalenicForm   = Struct.new("GalenicForm",  :oid, :descriptions, :galenic_group)
 
@@ -103,7 +103,7 @@ module Oddb2xml
     @@names_without_galenic_forms = []
     @@rules_counter = {}
     attr_accessor   :galenic_form, :unit, :pkg_size
-    attr_reader     :name, :substances, :composition, :compositions
+    attr_reader     :name, :substances, :composition, :compositions, :composition_comment
     attr_reader     :selling_units, :count, :multi, :measure, :addition, :scale # s.a. commercial_form in oddb.org/src/model/part.rb
     def self.get_galenic_group(name, lang = 'de')
       @@galenic_groups.values.collect { |galenic_group|
@@ -182,10 +182,14 @@ public
         [name, dose ? [dose[0], dose[1]] : [nil, nil] ].flatten
       end
     end
+private
+    def remove_duplicated_spaces(string)
+      string ? string.to_s.gsub(/\s\s+/, ' ') : nil
+    end
 public
     def initialize(name = nil, size = nil, unit = nil, active_substance = nil, composition= nil)
-      @name = name
-      @pkg_size = size
+      @name = remove_duplicated_spaces(name)
+      @pkg_size = remove_duplicated_spaces(size)
       @unit = unit
       # @pkg_size, @galenic_group, @galenic_form =
       search_galenic_info
@@ -206,12 +210,20 @@ public
         current = numbers.shift
         labels = []
         composition_text = composition.gsub(/\r\n?/u, "\n")
+        puts "composition_text for #{name}: #{composition_text}" if composition_text.split(/\n/u).size > 1 and $VERBOSE
         compositions = composition_text.split(/\n/u).select do |line|
-          if match = /^(#{current})\)/.match(line)
-            labels.push match[1]
+          if match = /^(#{current})\)([^:]+)/.match(line)
+            labels.push [match[1], match[2]]
             current = numbers.shift
           end
         end
+        puts "labels for #{name}: #{labels}" if labels.size > 0 and $VERBOSE
+        if  composition_text.split(/\n/u).size > 1
+          last_line = composition_text.split(/\n/u)[-1]
+          @composition_comment = last_line
+        else
+          @composition_comment = nil
+        end
         if compositions.empty?
           compositions.push composition_text.gsub(/\n/u, ' ')
         end
@@ -221,7 +233,7 @@ public
           composition.gsub!(/'/, '')
           @active_substances.each { |name|
             name, qty, unit = Calc.update_active_agent(name, composition)
-            res << Composition.new(name, qty.to_f, unit) if name
+            res << Composition.new(name, qty.to_f, unit, labels[idx] ? labels[idx].join('') : nil) if name
           }
         end
         @compositions = res
@@ -366,7 +378,7 @@ public
           # puts "oid #{UnknownGalenicForm} #{@galenic_form.oid} for #{name}"
           break unless @galenic_form.oid == UnknownGalenicForm
           if @galenic_form.oid == UnknownGalenicForm
-            @galenic_form =  GalenicForm.new(0, {'de' => form_name}, @@galenic_forms[UnknownGalenicForm] )
+            @galenic_form =  GalenicForm.new(0, {'de' => remove_duplicated_spaces(form_name.gsub(' +', ' '))}, @@galenic_forms[UnknownGalenicForm] )
             @@new_galenic_forms << form_name
           end
         }

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.9.7"
+  VERSION = "1.9.8"
 end

data/spec/calc_spec.rb

@@ -260,7 +260,8 @@ Corresp. 5300 kJ.",
               expect(File.exists?(full)).to eq true
              }
       xml = File.read(File.join(Oddb2xml::WorkDir, 'oddb_calc.xml'))
-      puts xml
+      m = />.*  /.match(xml)
+      m.should eq nil
       doc = REXML::Document.new xml
       gtin = '7680540151009'
       ean12 = '7680' + sprintf('%05d',tst_naropin.iksnr_A) + sprintf('%03d',tst_naropin.pack_K)
@@ -284,9 +285,9 @@ Corresp. 5300 kJ.",
           puts "Testing key #{key.inspect} #{value.inspect} against #{result} seems to fail" unless result == value.to_s
           result.should eq value.to_s
       }
-      XPath.match( doc, "//ARTICLE[GTIN='7680006790124']/COMPOSITIONS/COMPOSITION/NAME").last.text.should eq 'Bifidobacterium Infantis'
-      XPath.match( doc, "//ARTICLE[GTIN='7680545250363']/COMPOSITIONS/COMPOSITION/NAME").last.text.should eq 'Alprostadilum'
-#      I) Glucoselösung: glucosum anhydricum 150 g ut glucosum monohydricum, natrii dihydrogenophosphas dihydricus 2.34 g, zinci acetas dihydricus 6.58 mg, aqua ad iniectabilia q.s. ad solutionem pro 500 ml.
+      XPath.match( doc, "//ARTICLE[GTIN='7680006790124']/COMPOSITIONS/COMPONENT/NAME").last.text.should eq 'Bifidobacterium Infantis'
+      XPath.match( doc, "//ARTICLE[GTIN='7680545250363']/COMPOSITIONS/COMPONENT/NAME").last.text.should eq 'Alprostadilum'
+      XPath.match( doc, "//ARTICLE[GTIN='7680458820202']/NAME").last.text.should eq 'Magnesiumchlorid 0,5 molar B. Braun, Zusatzampulle für Infusionslösungen'
    end
   end
 
@@ -337,4 +338,27 @@ Corresp. 5300 kJ.",
     skip "Infloran, capsule mit cryodesiccatus min. 10^9 CFU"
   end
 
+  context 'find correct result compositions' do
+    result = Calc.new('Nutriflex Lipid peri, Infusionsemulsion, 1250ml', nil, nil,
+                      'glucosum anhydricum, zinci acetas dihydricus, isoleucinum, leucinum, lysinum anhydricum, methioninum, phenylalaninum, threoninum, tryptophanum, valinum, argininum, histidinum, alaninum, acidum asparticum, acidum glutamicum, glycinum, prolinum, serinum, magnesii acetas tetrahydricus, chloridum, phosphas, acetas, sojae oleum, triglycerida saturata media',
+                      'I) Glucoselösung: glucosum anhydricum 80 g ut glucosum monohydricum, natrii dihydrogenophosphas dihydricus 1.17 g, zinci acetas dihydricus 6.625 mg, acidum citricum q.s. ad pH, aqua ad iniectabilia q.s. ad solutionem pro 500 ml.
+II) Fettemulsion: sojae oleum 25 g, triglycerida saturata media 25 g, lecithinum ex ovo 3 g, glycerolum, natrii oleas, aqua q.s. ad emulsionem pro 250 ml.
+III) Aminosäurenlösung: isoleucinum 2.34 g, leucinum 3.13 g, lysinum anhydricum 2.26 g ut lysini hydrochloridum, methioninum 1.96 g, phenylalaninum 3.51 g, threoninum 1.82 g, tryptophanum 0.57 g, valinum 2.6 g, argininum 2.7 g, histidinum 1.25 g ut histidini hydrochloridum monohydricum, alaninum 4.85 g, acidum asparticum 1.5 g, acidum glutamicum 3.5 g, glycinum 1.65 g, prolinum 3.4 g, serinum 3 g, natrii hydroxidum 0.8 g, natrii chloridum 1.081 g, natrii acetas trihydricus 0.544 g, kalii acetas 2.943 g, magnesii acetas tetrahydricus 0.644 g, calcii chloridum dihydricum 0.441 g, aqua ad iniectabilia q.s. ad solutionem pro 500 ml.
+.
+I) et II) et III) corresp.: aminoacida 32 g/l, carbohydrata 64 g/l, materia crassa 40 g/l, natrium 40 mmol/l, kalium 24 mmol/l, calcium 2.4 mmol/l, magnesium 2.4 mmol, zincum 0.024 mmol/l, chloridum 38.4 mmol/l, phosphas 6 mmol/l, acetas 32 mmol/l, acidum citricum monohydricum, in emulsione recenter mixta 1250 ml.
+Corresp. 4000 kJ.')
+    specify { expect(result.compositions.first.name).to eq  'Glucosum Anhydricum' }
+    specify { expect(result.compositions.first.qty).to eq  80.0}
+    specify { expect(result.compositions.first.unit).to eq  'g/500 ml'}
+    zinci =  result.compositions.find{ |x| x.name == 'Zinci Acetas Dihydricus' }
+    specify { expect(zinci.name).to eq  'Zinci Acetas Dihydricus' }
+    specify { expect(zinci.qty).to eq  6.625}
+    specify { expect(zinci.unit).to eq  'mg/500 ml'}
+    zinci =  result.compositions.find{ |x| x.name == 'Zinci Acetas Dihydricus' }
+    natrii =  result.compositions.find{ |x| x.name == 'Natrii Dihydrogenophosphas Dihydricus' }
+    specify { expect(zinci).not_to eq nil}
+    skip 'Is Natrii Dihydrogenophosphas Dihydricus a real error or not?'
+    # specify { expect(natrii).not_to eq nil }
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.9.8
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip