oddb2xml 2.5.8 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 366f44dde83e17df28bf8f833ab7a41abea0c018
-  data.tar.gz: 9e97aaefb44149756996f4ce4c8220d0679f876f
+  metadata.gz: fc9711600834d1ef9b14c3dd2c1f7c82e725bd22
+  data.tar.gz: 258203f1ea2cd3dd7b8ec6e33c0a1568f5c7f249
 SHA512:
-  metadata.gz: 381616e0bc2e029a1013b6763dfb8bf9ee9d4900d09e5fa0015d519ac36306895b69f16e9e67152e23d5cc4140b8510148fa85706a63e2d2c8e52bc16df39c18
-  data.tar.gz: bb9bc23c545dbdd00f3c8e9e71cfa8c98d4002c44ed9db81cc42b7a2f59559c4049c68085ca029af9c786c3bf9d39fc55dc47beb0e761ab4497efd0d5fb50ce7
+  metadata.gz: 8827e73d456965da4c44c1e9e06b89ee1a091c0be1d77204f54443f31b7494cce4d6afb4af956907fdfa272854abd7d33a23c4834a41ef49c080fad3a4c11b82
+  data.tar.gz: d0db714f066294ad1e1f0b389f366bd96f7c23a2955a8dd609303293b7c29291a16ce720c6e1363b18224c410f7383d07b42a4e65e737681a56d0620bde448cb

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.5.9 / 06.12.2018
+
+* Only changes when generating artikelstamm
+** Use sequence name from packages when there is no german name in the article (from refdata)
+** Correct header of artikelstamm-*.csv
+
 === 2.5.8 / 20.09.2018
 
 * Set SALECD to 'A' if article is from refdata_pharma/swissmedic

data/lib/oddb2xml/builder.rb

@@ -1397,7 +1397,7 @@ module Oddb2xml
     def build_artikelstamm
       @@emitted_v5_gtins = []
       @csv_file = CSV.open(File.join(WorkDir,  "artikelstamm_#{Date.today.strftime('%d%m%Y')}_v5.csv"), "w+")
-      @csv_file << ['gtin', 'price', 'galenic_form', 'pkg_size', 'pexf', 'ppub', 'iksnr', 'atc_code', 'active_substance', 'original', 'it-code', 'sl-liste']
+      @csv_file << ['gtin', 'name', 'pkg_size', 'galenic_form', 'price_ex_factory', 'price_public', 'prodno', 'atc_code', 'active_substance', 'original', 'it-code', 'sl-liste']
       @csv_file.sync = true
       variant = "build_artikelstamm"
       # @infos_zur_rose.delete_if { |key, val| val[:cmut].eql?('3') } # collect only active zur rose item
@@ -1581,7 +1581,7 @@ module Oddb2xml
             # in refdata/packungen
             chap70 = nil
             if @chapter70items.values.find {|x| x[:pharmacode] && x[:pharmacode].eql?(obj[:pharmacode])}
-              Oddb2xml.log "found chapter #{obj[:pharmacode]}"
+              Oddb2xml.log "found chapter #{obj[:pharmacode]}" if $VERBOSE
               chap70 = true
             end
             patched_pharma_type = (/^7680/.match(ean13.to_s.rjust(13, '0')) || chap70 ? 'P': 'N' )
@@ -1680,8 +1680,17 @@ module Oddb2xml
                 xml.PRODNO prodno
                 if sequence
                   xml.SALECD('A') # these products are always active!
-                  override(xml, prodno, :DSCR,  ((sequence[:name_de] ? sequence[:name_de] : '') + ' ' + sequence[:desc_de]).strip)
-                  override(xml, prodno, :DSCRF, ((sequence[:name_fr] ? sequence[:name_fr] : '') + ' ' + sequence[:desc_fr]).strip)
+                  name_de = sequence[:name_de]
+                  unless name_de
+                    if ppac &&  /stk/i.match( sequence[:desc_de])
+                      name_de = ppac[:sequence_name]
+                    else
+                      name_de = sequence[:desc_de]
+                    end
+                  end
+                  name_fr = sequence[:name_fr] || (ppac && ppac[:sequence_name]) || sequence[:desc_fr]
+                  override(xml, prodno, :DSCR,  name_de.strip)
+                  override(xml, prodno, :DSCRF, name_fr.strip)
                 end
                 xml.ATC sequence[:atc_code] if sequence && sequence[:atc_code] && !sequence[:atc_code].empty?
                 if sequence && sequence[:packages] && (first_package = sequence[:packages].values.first) &&

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.5.8"
+  VERSION = "2.5.9"
 end

data/spec/calc_spec.rb

@@ -315,6 +315,20 @@ Corresp. 5300 kJ.",
     specify { expect(res.first.class).to eq String }
   end
 
+  context 'should return correct value for 5 Ampullen a 10 mk' do
+    pkg_size_L = '5 Ampullen a 10 ml'
+    einheit_M  = 'Ampulle'
+    name_C = 'Suspension zur Injektion'
+
+    result = Calc.new(name_C, pkg_size_L, einheit_M, nil)
+    specify { expect(result.selling_units).to eq 5 }
+    specify { expect(result.measure).to eq einheit_M }
+    
+    res = Calc.report_conversion
+    specify { expect(res.class).to eq Array }
+    specify { expect(res.first.class).to eq String }
+  end
+
   context 'find correct result for Nutriflex' do
     info = Calc.new(Tst_nutriflex.name_C, Tst_nutriflex.package_size_L, Tst_nutriflex.einheit_M, Tst_nutriflex.active_substance_0, Tst_nutriflex.composition_P)
     specify { expect(info.selling_units).to eq  5 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip