oddb2xml 2.9.4 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a07febba3dbb4717920c6c45c42307b8454f5492cbeb198f4812e68f98e06b3
-  data.tar.gz: e2a3a7c28d1563d76bea00b95083615060e2430438abe34e3bed593cdf903559
+  metadata.gz: b2ab5b371ce3a8b15cebb3c454571086567f340a3ea70bc36f32ac9b77a65832
+  data.tar.gz: d2801aae2bdcb1d30381900b9a98de99522e85f8721119ec7128e3f4aefc4e48
 SHA512:
-  metadata.gz: 9de3798d92b1b2437b1cc2f395dc51a886d8bf5b7aca502cc19ec915a507ebd6258dacdb2cc38db10fa27a7b9e666648565d4d855e3aa54c32daedd5ade576cc
-  data.tar.gz: c5e4cd7e0e05111c2a3e04d957a166982743e0ab93a0d1d59b5eb76b6fcba5154c6d6da259f6e4f14eba764f8a256a3cc31a83713c6b72536a34ebae25c1b4c9
+  metadata.gz: f9198f5f6de7e6a3d163585b8e33ccc98d38ef5ff1517a8a44c0fddffdb25600951cbb31d621238a17c355440a69199f0268bd82a533add740ab69616f9de57b
+  data.tar.gz: cb5c8c93a780f44245edb74cc891e9819328e21dddf2f59d511619ed4530347fe10320e4cefcaba82bed0d2f88a4d63fae84efec038ae8f8a0d2877c8e40dfeb

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/extractor.rb

@@ -610,7 +610,7 @@ module Oddb2xml
         gtin = row[0].value.to_s.gsub(/^0+/, '')
         data[gtin] = {
           gtin: gtin,
-          gln: row[1].value.to_s,
+          gtin: row[1]&.value.to_s,
           target_market: row[2] ? row[2].value.to_s: "",
           gpc: row[3] ? row[3].value.to_s: "",
           trade_item_description_de: row[4] ? row[4].value.to_s: "",

data/lib/oddb2xml/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.6
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -550,7 +550,7 @@ homepage: https://github.com/zdavatz/oddb2xml
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -565,8 +565,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: oddb2xml creates xml files.
 test_files: