oddb2xml 2.9.4 → 2.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a07febba3dbb4717920c6c45c42307b8454f5492cbeb198f4812e68f98e06b3
-  data.tar.gz: e2a3a7c28d1563d76bea00b95083615060e2430438abe34e3bed593cdf903559
+  metadata.gz: 81e52658848bb173c8567f2b0b5d0c0602174df59c3dae92d684b610cf2bd24f
+  data.tar.gz: 481933787eca6b97b4cf62e6f82cf6a8fbc1ed7c5fb919fd744e01cdddd67dac
 SHA512:
-  metadata.gz: 9de3798d92b1b2437b1cc2f395dc51a886d8bf5b7aca502cc19ec915a507ebd6258dacdb2cc38db10fa27a7b9e666648565d4d855e3aa54c32daedd5ade576cc
-  data.tar.gz: c5e4cd7e0e05111c2a3e04d957a166982743e0ab93a0d1d59b5eb76b6fcba5154c6d6da259f6e4f14eba764f8a256a3cc31a83713c6b72536a34ebae25c1b4c9
+  metadata.gz: 10eecf8efc056b0b5f921aa9da9e05b8f97711b0e75815a2d5e4ccd5a1984a8552634198b9e59eb68d41001bd89c3dc2cddf160e12d9b1de3880b103976bdfa1
+  data.tar.gz: 86e7f32498ecea679340177b6ac458dc023dc9242b9cb5dc5ea0d2ba1d5c7a7d97f0b75615848a4c8ffba7c474615ddadcf0f3e41c0739bdf5e30c66f2e24052

data/lib/oddb2xml/builder.rb

@@ -605,6 +605,7 @@ module Oddb2xml
       add_missing_products_from_swissmedic
       add_products_from_bag_preparations(true)
       nbr_products = 0
+      added_gtin = Set.new
       Oddb2xml.log "build_product #{@products.size + @missing.size} products"
       a_builder = Nokogiri::XML::Builder.new(encoding: "utf-8") do |xml|
         xml.doc.tag_suffix = @tag_suffix
@@ -614,6 +615,7 @@ module Oddb2xml
             ean = obj[:ean13]
             next unless check_name(obj, :de)
             next unless check_name(obj, :fr)
+            next if added_gtin.include?(ean)
             next if /^Q/i.match?(obj[:atc])
             if obj[:prodno]
               next if emitted.index(obj[:prodno])
@@ -634,26 +636,14 @@ module Oddb2xml
               xml.CompositionSwissmedic obj[:composition_swissmedic] if obj[:composition_swissmedic]
             }
           end
-          @firstbase.each do |ean13, obj|
-            description = obj[:trade_item_description_de]
-            if description.empty?
-              description = obj[:trade_item_description_en]
-            end
-            if !description.empty? || !obj[:trade_item_description_fr].empty?
-              xml.PRD("DT" => "") {
-                xml.GTIN obj[:gtin]
-                xml.CPT
-                xml.DSCRD description
-                xml.DSCRF obj[:trade_item_description_fr]
-              }
-            end
-          end
           @products.sort.to_h.each do |ean13, obj|
             next if /^Q/i.match?(obj[:atc])
             seq = obj[:seq]
             ean = obj[:ean13]
             next unless check_name(obj, :de)
             next unless check_name(obj, :fr)
+            next if added_gtin.include?(ean)
+            added_gtin.add(ean)
             xml.PRD("DT" => obj[:last_change]) do
               nbr_products += 1
               xml.GTIN ean
@@ -766,6 +756,22 @@ module Oddb2xml
               xml.CompositionSwissmedic obj[:comp] unless obj[:comp].empty?
             end
           end
+          @firstbase.each do |ean13, obj|
+            description = obj[:trade_item_description_de]
+            if description.empty?
+              description = obj[:trade_item_description_en]
+            end
+            next if added_gtin.include?(obj[:gtin])
+            if !description.empty? || !obj[:trade_item_description_fr].empty?
+              added_gtin.add(obj[:gtin])
+              xml.PRD("DT" => "") {
+                xml.GTIN obj[:gtin]
+                xml.CPT
+                xml.DSCRD description
+                xml.DSCRF obj[:trade_item_description_fr]
+              }
+            end
+          end
           xml.RESULT {
             xml.OK_ERROR "OK"
             xml.NBR_RECORD nbr_products

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.9.4"
+  VERSION = "2.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.5
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip