oddb2xml 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3bb1935034ceac75c20a7a760647779e269cfbd
-  data.tar.gz: c7a68dad6adbf982c83d6ef8b9794bc551f2233b
+  metadata.gz: d53eced411a8265a49354d1c7ffb1309c10a4545
+  data.tar.gz: d53b5e31652a7b16b3889a3bf6636f2a06ca5ba8
 SHA512:
-  metadata.gz: 549c6c25a4e157b3dd463fbae8ab2fea31d26a6ef0eac7c6020acc8a0904ed6c638d4ee29f4bad6e594874686a1c24e3b6ec84fefb0bf6baf0e85381e453f546
-  data.tar.gz: 0dce9a5cf5bb1afc960d524cf2208e27d79c516c0f00b42596783004de39f2b3d949c66874dba7576e2bfd41768bc21bf850c58e7dba91b873ffca1b0e5e9515
+  metadata.gz: 9f782573e7dca61022e7f44c2a34794673473def7c79d20676106387c779e6965a157a29f510f56a396afad5c3838558d59b0e876d2b0e54a38ec60cf2536faf
+  data.tar.gz: ddb93469191bbcb33f3ae744fbf463bad8480d863b45631fb43e543a7a1052a7a596baec4fd044396d8508270c5289c3944201ef6ff41d0d9ad0d072a05eb6dd

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.4.4 / 23.10.2017
+
+* Add articles which are only found in the Preparation.xml (e.g. Mutagrid)
+* Correct SwissmedicNo8 when less than 8 chars long
+
 === 2.4.3 / 11.09.2017
 
 * Never drop lines with UTF-8 problems while creating XML files

data/lib/oddb2xml/builder.rb

@@ -768,10 +768,28 @@ module Oddb2xml
       prepare_articles
       idx = 0
       nbr_records = 0
+      @preparations_only = []
       Oddb2xml.log "build_article #{idx} of #{@articles.size} articles"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
+        eans_from_refdata = @articles.collect{|refdata|  refdata[:ean] }
+        eans_from_preparations = @items.keys
+        missing_eans = []
+        eans_from_preparations.each do |ean|
+          next if ean.to_i == 0
+          unless eans_from_refdata.index(ean)
+            @preparations_only << ean
+            missing_eans << ean
+            item = @items[ean].clone
+            next if defined?(RSpec) && !item[:pharmacode]
+            item[:ean] = ean
+            item[:_type] = :preparations_xml
+            item[:desc_de] = item[:name_de] + ' ' + item[:desc_de]
+            item[:desc_fr] = item[:name_fr] + ' ' + item[:desc_fr]
+            @articles << item
+          end
+        end
         xml.ARTICLE(XML_OPTIONS) {
         @articles.sort! { |a,b| a[:ean] <=> b[:ean] }
         @articles.each do |obj|
@@ -844,9 +862,6 @@ module Oddb2xml
                 xml.BG(flag ? 'Y' : 'N')
               end
               #xml.EXP
-              if item and item[:substances] and substance = item[:substances].first
-                xml.QTY   "#{substance[:quantity]}#{substance[:unit] ? ' ' + substance[:unit] : ''}"
-              end if false # TODO: get qty/unit from refdata name
               xml.DSCRD obj[:desc_de]            if obj[:desc_de] and not obj[:desc_de].empty?
               xml.DSCRF obj[:desc_fr]            if obj[:desc_fr] and not obj[:desc_fr].empty?
               xml.DSCRF obj[:desc_de]            if !obj[:desc_fr] or obj[:desc_fr].empty?
@@ -953,7 +968,7 @@ module Oddb2xml
           }
         }
       end
-      Oddb2xml.log "build_article. Done #{idx} of #{@articles.size} articles"
+      Oddb2xml.log "build_article. Done #{idx} of #{@articles.size} articles " + ( @preparations_only.size > 0 ? ('. Only in preparations.xml '+ @preparations_only.join(' ')) : '')
       Oddb2xml.add_hash(_builder.to_xml)
     end
     def build_fi
@@ -1108,6 +1123,7 @@ module Oddb2xml
       elsif @items[de_idx[:pharmacode]] # BAG-XML (SL/LS)
         10
       elsif (de_idx[:migel] or # MiGel (xls)
+             de_idx[:_type] == :preparations_xml or
              de_idx[:_type] == :nonpharma) # MiGel (swissindex)
         13
       else

data/lib/oddb2xml/extractor.rb

@@ -68,11 +68,21 @@ module Oddb2xml
         item[:pharmacodes] = []
         item[:packages]    = {} # pharmacode => package
         seq.Packs.Pack.each do |pac|
+          if pac.SwissmedicNo8 && pac.SwissmedicNo8.length < 8
+            puts "BagXmlExtractor: Adding leading zeros for SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}"
+            pac.SwissmedicNo8  = pac.SwissmedicNo8.rjust(8, '0')
+          end
           unless pac.GTIN
-            puts "BagXmlExtractor: Skipping as missing GTIN in SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId}. Skipping"
-            next
+            unless pac.SwissmedicNo8
+              puts "BagXmlExtractor: Skipping as missing GTIN in SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}. Skipping"
+            else
+              ean12 = '7680' + pac.SwissmedicNo8
+              pac.GTIN  = (ean12 + Oddb2xml.calc_checksum(ean12))
+              puts "BagXmlExtractor: Setting missing GTIN  #{pac.GTIN} in SwissmedicNo8 #{pac.SwissmedicNo8}  BagDossierNo #{pac.BagDossierNo} PackId #{pac.PackId} #{item[:name_de]}."
+            end
           end
           ean = pac.GTIN.to_i
+          
           # packages
           exf = {:price => '', :valid_date => '', :price_code => ''}
           if pac.Prices and pac.Prices.ExFactoryPrice
@@ -89,7 +99,7 @@ module Oddb2xml
           item[:packages][ean] = {
             :ean                 => ean,
             :swissmedic_category => (cat = pac.SwissmedicCategory) ? cat : '',
-            :swissmedic_number8  => (num = pac.SwissmedicNo8)      ? num.rjust(8, '0') : '',
+            :swissmedic_number8  => (num = pac.SwissmedicNo8)      ? num : '',
             :prices              => { :exf_price => exf, :pub_price => pub },
           }
           # related all limitations

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end

data/spec/extractor_spec.rb

@@ -125,7 +125,7 @@ describe Oddb2xml::BagXmlExtractor do
       expect(with_pharma[:packages].size).to eq(1)
       expect(with_pharma[:packages].first[0]).to eq(Oddb2xml::THREE_TC_GTIN)
       expect(with_pharma[:packages].first[1][:prices][:pub_price][:price]).to eq('205.3')
-      expect(@items.size).to eq(4)
+      expect(@items.size).to eq(5)
     end
     it "should handle pub_price for 7680620690084 correctly" do
       @items = subject.to_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip