oddb2xml 2.9.8 → 2.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c3b4fd2969d449a3f831746a612854c4f0698898608f8fdf0b5ee89031ab904
-  data.tar.gz: 2a7736a3770feb3ec001b19983517d7b5f2863d60535fea10be97e0aeddb633c
+  metadata.gz: 538eaca672eb756d84b1aa382f5a9a27e4109a3f28575386d4f0ad0aed1f7e58
+  data.tar.gz: 3d7cd4d55f9e738acfabe9ab04b2b391c4144b30db8f21534d7f8c58dbf8e9d3
 SHA512:
-  metadata.gz: b8e071d8e7a4633cabeec2bf5a3ebc8f9be57e012e1c17d01dfb72dbecbf2366319607381c978e3fe92e7b6e74a4894d5ce507dfd2fc460b657d349d2aaa53d0
-  data.tar.gz: 581dad03717df312b1ef772ecc2dcf0fc214f59134d7f377037daf4992e8c1d3a714b1b13dc14b1f722ad430c6b865280c6f48d503b40931f6845b3d021fb4cd
+  metadata.gz: 953e11dece40e657143b7e85ca9d0a32d614b0cdd717f4ffb4dd6a6a4ddbc55bb851afd2db2a19d4b8c5e651488514a392951dffee677e763573beb0c2c0b6e2
+  data.tar.gz: 55289f276f21c170ae2bb50ab8c5c53ab197529f3b101079b941d15688f2650571f0a158c7067807106920c87363641baae0196d432e2e7406ce90394dfee7b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.9.8)
+    oddb2xml (2.9.2)
       htmlentities
       httpi
       mechanize
@@ -28,36 +28,34 @@ GEM
   specs:
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    akami (1.3.3)
-      base64
+    akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
-    ast (2.4.3)
-    base64 (0.2.0)
-    bigdecimal (3.1.9)
-    builder (3.3.0)
+    ast (2.4.2)
+    base64 (0.1.1)
+    builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    connection_pool (2.5.0)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
-    domain_name (0.6.20240107)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
     flexmock (2.3.8)
     gyoku (1.4.0)
       builder (>= 2.1.2)
       rexml (~> 3.0)
     hashdiff (1.0.1)
     htmlentities (4.3.4)
-    http-cookie (1.0.8)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpi (2.5.0)
       rack
       socksify
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
-    logger (1.7.0)
     mechanize (2.7.7)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
@@ -69,31 +67,27 @@ GEM
       webrick (~> 1.7)
       webrobots (>= 0.0.9, < 0.2)
     method_source (1.0.0)
-    mime-types (3.6.2)
-      logger
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0408)
+    mime-types-data (3.2023.0808)
     mini_portile2 (2.8.4)
-    minitar (1.0.2)
+    minitar (0.9)
     multi_json (1.15.0)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (4.0.5)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nori (2.7.1)
-      bigdecimal
+    nori (2.6.0)
     ntlm-http (0.1.1)
-    optimist (3.2.1)
-    ox (2.14.22)
-      bigdecimal (>= 3.0)
-    parallel (1.26.3)
-    parser (3.3.7.4)
+    optimist (3.1.0)
+    ox (2.14.17)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
-    prism (1.4.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -110,7 +104,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     rdoc (6.3.3)
-    regexp_parser (2.10.0)
+    regexp_parser (2.8.1)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -125,31 +119,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.75.2)
+    rubocop (1.56.4)
+      base64 (~> 0.1.1)
       json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.3.0.2)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.0)
-      parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.25.0)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    ruby-ole (1.2.13.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.19.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-ole (1.2.12.2)
     ruby-progressbar (1.13.0)
-    rubyXL (3.4.33)
+    rubyXL (3.4.25)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyntlm (0.5.1)
-    rubyzip (2.4.1)
+    rubyzip (2.3.2)
     savon (2.12.1)
       akami (~> 1.2)
       builder (>= 2.1.2)
@@ -160,28 +153,27 @@ GEM
       wasabi (~> 3.4)
     sax-machine (1.3.2)
     socksify (1.7.1)
-    spreadsheet (1.3.4)
-      bigdecimal
-      logger
+    spreadsheet (1.3.0)
       ruby-ole
-    standard (1.49.0)
+    standard (1.31.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.2)
+      rubocop (~> 1.56.2)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.8)
+      standard-performance (~> 1.2)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.8.0)
+    standard-performance (1.2.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.25.0)
+      rubocop-performance (~> 1.19.0)
     standardrb (1.0.1)
       standard
     timecop (0.9.8)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.5.0)
     vcr (6.2.0)
     wasabi (3.7.0)
       addressable
@@ -191,7 +183,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.1)
+    webrick (1.8.1)
     webrobots (0.1.2)
     xml-simple (1.1.9)
       rexml

data/lib/oddb2xml/cli.rb

@@ -65,7 +65,12 @@ module Oddb2xml
           threads << download(:firstbase) # https://github.com/zdavatz/oddb2xml/issues/63
         end
         types.each do |type|
-          threads << download(:refdata, type) # refdata
+          begin
+            threads << download(:refdata, type) # refdata
+          rescue error
+            # Should continue even when error #102
+            Oddb2xml.log("Error in downloading refdata #{error}")
+          end
         end
       end
       begin
@@ -311,10 +316,15 @@ module Oddb2xml
           end
         end
         @mutex.synchronize do
-          hsh = RefdataExtractor.new(xml, type).to_hash
-          @refdata_types[type] = hsh
-          Oddb2xml.log("RefdataExtractor #{type} added #{hsh.size} keys now #{@refdata_types.keys} items from xml with #{xml.size} bytes")
-          @refdata_types[type]
+          begin
+            hsh = RefdataExtractor.new(xml, type).to_hash
+            @refdata_types[type] = hsh
+            Oddb2xml.log("RefdataExtractor #{type} added #{hsh.size} keys now #{@refdata_types.keys} items from xml with #{xml.size} bytes")
+            @refdata_types[type]
+          rescue error
+            # Should continue even when error https://github.com/zdavatz/oddb2xml/issues/102
+            Oddb2xml.log("Error in RefdataExtractor #{error}")
+          end
         end
 
       when :firstbase

data/lib/oddb2xml/downloader.rb

@@ -241,9 +241,9 @@ module Oddb2xml
   end
 
   class RefdataDownloader < Downloader
+    include DownloadMethod
     def initialize(options = {}, type = :pharma)
-      @type = (type == :pharma ? "Pharma" : "NonPharma")
-      url = "https://refdatabase.refdata.ch/Service/Article.asmx?WSDL"
+      url = "https://files.refdata.ch/simis-public-prod/Articles/1.0/Refdata.Articles.zip"
       super(options, url)
     end
 
@@ -258,46 +258,10 @@ module Oddb2xml
     end
 
     def download
-      begin
-        @file2save = File.join(DOWNLOADS, "refdata_#{@type}.xml")
-        soap = %(<?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://refdatabase.refdata.ch/Article_in" xmlns:ns2="http://refdatabase.refdata.ch/">
-  <SOAP-ENV:Body>
-    <ns2:DownloadArticleInput>
-      <ns1:ATYPE>#{@type.upcase}</ns1:ATYPE>
-    </ns2:DownloadArticleInput>
-  </SOAP-ENV:Body>
-  </SOAP-ENV:Envelope>
-</ns1:ATYPE></ns2:DownloadArticleInput></SOAP-ENV:Body>
-)
-        report_download(@url, @file2save)
-        return IO.read(@file2save) if Oddb2xml.skip_download? && File.exist?(@file2save)
-        FileUtils.rm_f(@file2save, verbose: true)
-        response = @client.call(:download, xml: soap)
-        if response.success?
-          if (xml = response.to_xml)
-            xml = File.read(File.join(Oddb2xml::SpecData, File.basename(@file2save))) if defined?(RSpec)
-            response = nil # win
-            FileUtils.makedirs(DOWNLOADS)
-            File.open(@file2save, "w+") { |file| file.write xml }
-            if @options[:artikelstamm]
-              cmd = "xmllint --format --output #{@file2save} #{@file2save}"
-              Oddb2xml.log(cmd)
-              system(cmd)
-            end
-          else
-            # received broken data or internal error
-            raise StandardError
-          end
-        else
-          raise Timeout::Error
-        end
-      rescue HTTPI::SSLError
-        exit # catch me in Cli class
-      rescue Timeout::Error, Errno::ETIMEDOUT
-        retrievable? ? retry : raise
-      end
-      xml
+      filename = "Refdata.Articles.zip"
+      download_as(filename, "w+")
+      content = read_xml_from_zip(/Refdata.Articles.xml/, File.join(DOWNLOADS, filename))
+      content
     end
   end
 

data/lib/oddb2xml/extractor.rb

@@ -208,10 +208,13 @@ module Oddb2xml
 
     def to_hash
       data = {}
-      result = SwissRegArticleEntry.parse(@xml.sub(STRIP_FOR_SAX_MACHINE, ""), lazy: true)
-      items = result.ARTICLE.ITEM
-      items.each do |pac|
-        ean13 = (gtin = pac.GTIN.to_s) ? gtin : "0"
+      result = SwissRegArticles.parse(@xml.sub(STRIP_FOR_SAX_MACHINE, ""), lazy: true)
+      result.Article.each do |article|
+        article_type = article.MedicinalProduct.ProductClassification.ProductClass
+        if article_type != @type
+          next
+        end
+        ean13 = @type == "PHARMA" ? article.PackagedProduct.DataCarrierIdentifier : article.MedicinalProduct.Identifier
         if ean13.size < 13
           puts "Refdata #{@type} use 13 chars not #{ean13.size} for #{ean13}" if $VERBOSE
           ean13 = ean13.rjust(13, "0")
@@ -220,21 +223,29 @@ module Oddb2xml
           puts "Refdata #{@type} remove leading '0' for #{ean13}" if $VERBOSE
           ean13 = ean13[1..-1]
         end
-        # but in refdata_nonPharma we have a about 700 GTINs which are 14 characters and longer
         item = {}
         item[:ean13] = ean13
-        item[:no8] = pac.SWMC_AUTHNR
+        item[:no8] = article.PackagedProduct.RegulatedAuthorisationIdentifier || ""
         item[:data_origin] = "refdata"
         item[:refdata] = true
-        item[:_type] = (typ = pac.ATYPE.downcase.to_sym) ? typ : ""
-        item[:last_change] = (date = Time.parse(pac.DT).to_s) ? date : "" # Date and time of last data change
-        item[:desc_de] = (dscr = pac.NAME_DE) ? dscr : ""
-        item[:desc_fr] = (dscr = pac.NAME_FR) ? dscr : ""
-        item[:desc_it] = item[:desc_de] # refdata has no italian name
-        item[:atc_code] = (code = pac.ATC) ? code.to_s : ""
-        item[:company_name] = (nam = pac.AUTH_HOLDER_NAME) ? nam : ""
-        item[:company_ean] = (gln = pac.AUTH_HOLDER_GLN) ? gln : ""
-        data[item[:ean13]] = item
+        item[:_type] = @type.downcase.to_sym
+        item[:last_change] = "" # TODO: Date and time of last data change
+        item[:desc_de] = ""
+        item[:desc_fr] = ""
+        item[:desc_it] = ""
+        article.PackagedProduct.Name.each do |name|
+          if name.Language == "DE"
+            item[:desc_de] = name.FullName
+          elsif name.Language == "FR"
+            item[:desc_fr] = name.FullName
+          elsif name.Language == "IT"
+            item[:desc_it] = name.FullName
+          end
+        end
+        item[:atc_code] = article.MedicinalProduct.ProductClassification.Atc || ""
+        item[:company_name] = article.PackagedProduct.Holder.Name || ""
+        item[:company_ean] = article.PackagedProduct.Holder.Identifier || ""
+        data[ean13] = item
       end
       data
     end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.9.8"
+  VERSION = "2.9.9"
 end

data/lib/oddb2xml/xml_definitions.rb

@@ -238,29 +238,69 @@ class MedicalInformationsEntry
   element :medicalInformations, class: MedicalInformationsContent
 end
 
-class SwissRegItemContentContent
+class SwissRegProductClassification
   include SAXMachine
-  attribute :DT
-  element :ATYPE
-  element :GTIN
-  element :PHAR
-  element :SWMC_AUTHNR
-  element :NAME_DE
-  element :NAME_FR
-  element :ADDSCR
-  element :ATC
-  element :AUTH_HOLDER_NAME
-  element :AUTH_HOLDER_GLN
+  element :ProductClass
+  element :Atc
 end
 
-class SwissRegArticleContent
+class SwissRegMedicinalProduct
   include SAXMachine
-  attribute :CREATION_DATETIME
-  elements :ITEM, class: SwissRegItemContentContent
+  element :Identifier
+  element :Domain
+  element :LegalStatusOfSupply
+  element :RegulatedAuthorisationIdentifier
+  element :ProductClassification, class: SwissRegProductClassification
 end
 
-class SwissRegArticleEntry
+class SwissRegHolder
   include SAXMachine
-  element :CREATION_DATETIME
-  element :ARTICLE, class: SwissRegArticleContent
+  element :Identifier
+  element :Name
+end
+
+class SwissRegName
+  include SAXMachine
+  element :Language
+  element :FullName
+end
+
+class SwissRegMarketingStatus
+  include SAXMachine
+  element :DateStart
+end
+
+class SwissRegPackagedProduct
+  include SAXMachine
+  element :Identifier
+  element :RegulatedAuthorisationIdentifier
+  element :DataCarrierIdentifier
+  element :Holder, class: SwissRegHolder
+  elements :Name, class: SwissRegName
+  element :MarketingStatus, class: SwissRegMarketingStatus
+end
+
+class SwissRegArticle
+  include SAXMachine
+  element :MedicinalProduct, class: SwissRegMedicinalProduct
+  element :PackagedProduct, class: SwissRegPackagedProduct
+end
+
+class SwissRegDocumentReference
+  include SAXMachine
+  element :Language
+  element :Url
+end
+
+class SwissRegProductPrice
+  include SAXMachine
+  element :RetailPrice
+end
+
+class SwissRegArticles
+  include SAXMachine
+  elements :Article, class: SwissRegArticle
+  elements :DocumentReference, class: SwissRegDocumentReference
+  element :Hpc
+  element :ProductPrice, class: SwissRegProductPrice
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.9.8
+  version: 2.9.9
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -565,7 +565,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: oddb2xml creates xml files.