oddb2xml 2.7.9 → 2.8.1

data/lib/oddb2xml/builder.rb

@@ -42,7 +42,7 @@ module Oddb2xml
     @@gtin2ignore ||= []
     attr_accessor :subject, :refdata, :items, :flags, :lppvs,
       :actions, :migel, :orphan,
-      :infos, :packs, :infos_zur_rose,
+      :infos, :packs, :infos_zur_rose, :firstbase,
       :ean14, :tag_suffix,
       :companies, :people,
       :xsd
@@ -57,6 +57,7 @@ module Oddb2xml
       @packs = {}
       @migel = {}
       @infos_zur_rose ||= {}
+      @firstbase ||= {}
       @actions = []
       @orphan = []
       @ean14 = false
@@ -170,6 +171,23 @@ module Oddb2xml
             end
           end
         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?) && @refdata[obj[:gtin]].nil?
+            entry = {
+              ean13: obj[:gtin],
+              desc_de: description,
+              desc_fr: obj[:trade_item_description_fr],
+              atc_code: "",
+              company_ean: obj[:gln],
+              firstbase: true
+            }
+            @articles << entry
+          end
+        end
       end
       Oddb2xml.log("prepare_articles done. Added #{nr_added} prices. Total #{@articles.size}")
     end
@@ -580,6 +598,20 @@ 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]
@@ -1514,21 +1546,21 @@ module Oddb2xml
                   xml.GTIN pkg_gtin.to_s.rjust(13, "0")
                   xml.SALECD("A")
                   # maxLength for DSCR is 50 for Artikelstamm v3
-                  xml.DSCR(name) # for g for zur_rose
+                  xml.DSCR(name) # for description for zur_rose
                   name_fr = item[:name_fr] + " " + item[:desc_fr].strip + " " + package[:desc_fr] if package && package[:desc_fr]
                   name_fr ||= @refdata[pkg_gtin] ? @refdata[pkg_gtin][:desc_fr] : nil
                   # Zugelassenen Packungen has only german names
                   name_fr ||= (obj[:name_fr] + ", " + obj[:desc_fr]).strip if obj[:name_fr]
                   # ZuRorse has only german names
                   name_fr ||= (item[:name_fr] + ", " + item[:desc_fr]) if item
-                  xml.DSCRF(name_fr) if name_fr
+                  xml.DSCRF(name_fr)
                   name_it = item[:name_it] + " " + item[:desc_it].strip + " " + package[:desc_it] if package && package[:desc_it]
                   name_it ||= @refdata[pkg_gtin] ? @refdata[pkg_gtin][:desc_it] : nil
                   # Zugelassenen Packungen has only german names
                   name_it ||= (obj[:name_it] + ", " + obj[:desc_it]).strip if obj[:name_it]
                   # ZuRorse has only german names
                   name_it ||= (item[:name_it] + ", " + item[:desc_it]) if item
-                  xml.DSCRI(name_it) if name_it
+                  xml.DSCRI(name_it)
                   if obj[:company_name] || obj[:company_ean]
                     xml.COMP do # Manufacturer
                       xml.NAME obj[:company_name][0..99] # limit to 100 chars as in XSD
@@ -1641,7 +1673,7 @@ module Oddb2xml
                 emit_salecd(xml, ean13, obj)
                 description = obj[:desc_de] || obj[:description] # for description for zur_rose
                 xml.DSCR(description)
-                xml.DSCRF(obj[:desc_fr]) if obj[:desc_fr] && !obj[:desc_fr].empty?
+                xml.DSCRF(obj[:desc_fr])
                 xml.DSCRI(obj[:desc_it]) if obj[:desc_it] && !obj[:desc_it].empty?
                 if obj[:company_ean] && !obj[:company_ean].empty?
                   xml.COMP do
@@ -1746,7 +1778,6 @@ module Oddb2xml
               nr_products += 1
               xml.PRODUCT do
                 xml.PRODNO prodno
-
                 if sequence
                   xml.SALECD("A") # these products are always active!
                   name_de = "#{sequence[:name_de]} #{sequence[:desc_de]}".strip if sequence[:name_de]
@@ -1755,10 +1786,11 @@ module Oddb2xml
                   else
                     sequence[:desc_de]
                   end
+                  name_fr ||= (ppac && ppac[:sequence_name])
                   name_fr = "#{sequence[:name_fr]} #{sequence[:desc_fr]}".strip if sequence[:name_fr]
                   name_it = "#{sequence[:name_it]} #{sequence[:desc_it]}".strip if sequence[:name_it]
                   override(xml, prodno, :DSCR, name_de.strip)
-                  override(xml, prodno, :DSCRF, name_fr.strip) if name_fr && !name_fr.empty?
+                  override(xml, prodno, :DSCRF, name_fr.strip)
                   override(xml, prodno, :DSCRI, name_it.strip) if name_it && !name_it.empty?
                   # use overriden ATC if possibel
                   atc = sequence[:atc] || sequence[:atc_code]
@@ -1773,6 +1805,7 @@ module Oddb2xml
                   xml.comment "Chapter70 hack prodno #{prodno} #{obj[:description].encode(xml: :text).gsub("--", "-")}"
                   xml.SALECD("A") # these products are always active!
                   xml.DSCR obj[:description]
+                  xml.DSCRF ""
                   if @limitations.index(obj[:code])
                     xml.LIMNAMEBAG obj[:code]
                     used_limitations << obj[:code]

data/lib/oddb2xml/calc.rb

@@ -95,8 +95,8 @@ module Oddb2xml
     UNKNOWN_GALENIC_FORM = 140
     UNKNOWN_GALENIC_GROUP = 1
     DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data"))
-    @@galenic_groups = YAML.load_file(File.join(DATA_DIR, "gal_groups.yaml"))
-    @@galenic_forms = YAML.load_file(File.join(DATA_DIR, "gal_forms.yaml"))
+    @@galenic_groups = YAML.load_file(File.join(DATA_DIR, "gal_groups.yaml"),  permitted_classes: [ Oddb2xml::GalenicForm, Oddb2xml::GalenicGroup, Symbol])
+    @@galenic_forms = YAML.load_file(File.join(DATA_DIR, "gal_forms.yaml"),  permitted_classes: [ Oddb2xml::GalenicForm, Oddb2xml::GalenicGroup, Symbol])
     @@new_galenic_forms = []
     @@names_without_galenic_forms = []
     @@rules_counter = {}

data/lib/oddb2xml/cli.rb

@@ -26,6 +26,7 @@ module Oddb2xml
       @packs = {} # [option] Packungen from Swissmedic for dat
       @infos_zur_rose = {} # [addition] infos_zur_rose and other infos from zurrose transfer.txt
       @migel = {} # [addition] additional Non Pharma products from files repo
+      @firstbase = {}
       @actions = [] # [addition] interactions from epha
       @orphan = [] # [addition] Orphaned drugs from Swissmedic xls
       # addresses
@@ -60,6 +61,9 @@ module Oddb2xml
         threads << download(:package) # swissmedic
         threads << download(:lppv) # oddb2xml_files
         threads << download(:bag) # bag.e-mediat
+        if @options[:firstbase]
+          threads << download(:firstbase) # https://github.com/zdavatz/oddb2xml/issues/63
+        end
         types.each do |type|
           threads << download(:refdata, type) # refdata
         end
@@ -85,6 +89,7 @@ module Oddb2xml
           puts "Validatied #{@the_files[:artikelstamm]}"
         else
           puts "Validating failed using #{cmd}"
+          require'pry'; binding.pry
           raise "Validating failed using #{cmd}"
         end
       end
@@ -124,7 +129,7 @@ module Oddb2xml
           builder.infos = @infos
           builder.packs = @packs
           # additional sources
-          %w[actions orphan migel infos_zur_rose].each do |addition|
+          %w[actions orphan migel infos_zur_rose firstbase].each do |addition|
             builder.send("#{addition}=".intern, instance_variable_get("@#{addition}"))
           end
         end
@@ -312,6 +317,15 @@ module Oddb2xml
           @refdata_types[type]
         end
 
+      when :firstbase
+        downloader = FirstbaseDownloader.new(@options)
+        bin = downloader.download
+        Oddb2xml.log("FirstbaseDownloader bin #{File.size(bin)} bytes")
+        @mutex.synchronize do
+          @firstbase = FirstbaseExtractor.new(bin).to_hash
+          Oddb2xml.log("FirstbaseExtractor added #{@firstbase.size} firstbase items")
+          @firstbase
+        end
       end
     end
 

data/lib/oddb2xml/downloader.rb

@@ -381,4 +381,26 @@ module Oddb2xml
       read_xml_from_zip(/^AipsDownload_/iu, file)
     end
   end
+
+  class FirstbaseDownloader < Downloader
+    BASE_URL = "https://www.firstbase.ch"
+    include DownloadMethod
+    def initialize(type = :orphan, options = {})
+      @url = BASE_URL + "/sites/default/files/2023-09/firstbase_healthcare_public_data-dump%2C%2020230920.xlsx"
+    end
+
+    def download
+      @file2save = File.join(DOWNLOADS, "firstbase.xlsx")
+      report_download(@url, @file2save)
+      begin
+        download_as(@file2save, "w+")
+        return File.expand_path(@file2save)
+      rescue Timeout::Error, Errno::ETIMEDOUT
+        retrievable? ? retry : raise
+      ensure
+        Oddb2xml.download_finished(@file2save, false)
+      end
+      File.expand_path(@file2save)
+    end
+  end
 end

data/lib/oddb2xml/extractor.rb

@@ -591,4 +591,34 @@ module Oddb2xml
       nil
     end
   end
+
+  class FirstbaseExtractor < Extractor
+    def initialize(file)
+      @sheet = RubyXL::Parser.parse(file).worksheets[0]
+    end
+
+    def to_hash
+      data = {}
+      return data unless @sheet
+      @sheet.each_with_index do |row, i|
+        next if i <= 1
+        gtin = row[0].value.to_s.gsub(/^0+/, '')
+        data[gtin] = {
+          gtin: gtin,
+          gln: 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: "",
+          trade_item_description_en: row[5] ? row[5].value.to_s: "",
+          trade_item_description_fr: row[6] ? row[6].value.to_s: "",
+          trade_item_description_it: row[7] ? row[7].value.to_s: "",
+          manufacturer_name: row[8] ? row[8].value.to_s: "",
+          start_availability_date: row[9] ? row[9].value.to_s: "",
+          gross_weight: row[10] ? row[10].value.to_s: "",
+          net_weight: row[11] ? row[11].value.to_s: "",
+        }
+      end
+      data
+    end
+  end
 end

data/lib/oddb2xml/options.rb

@@ -43,6 +43,7 @@ module Oddb2xml
         opt :log, "log important actions", short: :none
         opt :use_ra11zip, "Use the ra11.zip (a zipped transfer.dat from Galexis)",
           default: File.exist?("ra11.zip") ? "ra11.zip" : nil, type: :string
+        opt :firstbase, "Build all NONPHARMA articles on firstbase", short: "b", default: false
       end
 
       @opts[:percent] = @opts[:increment]
@@ -63,6 +64,9 @@ module Oddb2xml
         @opts[:extended] = true
         @opts[:price] = :zurrose
       end
+      if @opts[:firstbase]
+        @opts[:nonpharma] = true
+      end
       @opts[:price] = :zurrose if @opts[:price].is_a?(TrueClass)
       @opts[:price] = @opts[:price].to_sym if @opts[:price]
       @opts[:ean14] = @opts[:include]

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.7.9"
+  VERSION = "2.8.1"
 end

data/spec/artikelstamm_spec.rb

@@ -75,11 +75,12 @@ describe Oddb2xml::Builder do
       expect(@inhalt.index(expected)).not_to be nil
     end
 
-    it "should have a ATC for product PRIORIX TETRA" do
+    it "should have a DSCRF and ATC for product PRIORIX TETRA" do
       expected = %(<PRODUCT>
             <PRODNO>5815801</PRODNO>
             <SALECD>A</SALECD>
             <DSCR>PRIORIX TETRA Trockensub c Solv Fertspr</DSCR>
+            <DSCRF>Priorix-Tetra, Pulver und Lösungsmittel zur Herstellung einer Injektionslösung</DSCRF>
             <ATC>J07BD54</ATC>
         </PRODUCT>)
       expect(@inhalt.index(expected)).not_to be nil
@@ -118,6 +119,7 @@ describe Oddb2xml::Builder do
             <PRODNO>5559401</PRODNO>
             <SALECD>A</SALECD>
             <DSCR>Nutriflex Lipid plus, Infusionsemulsion, 1250ml</DSCR>
+            <DSCRF/>
             <ATC>B05BA10</ATC>
         </PRODUCT>)
       expect(@inhalt.index(expected)).not_to be nil
@@ -244,6 +246,7 @@ describe Oddb2xml::Builder do
             <PHAR>0055805</PHAR>
             <SALECD>A</SALECD>
             <DSCR>TENSOPLAST Kompressionsbinde 5cmx4.5m</DSCR>
+            <DSCRF/>
             <PEXF>0.00</PEXF>
             <PPUB>22.95</PPUB>
         </ITEM>),
@@ -458,12 +461,14 @@ describe Oddb2xml::Builder do
             <!--Chapter70 hack prodno 2069639 Ceres Urtinkturen gemäss L2 mit - im Kommentar-->
             <SALECD>A</SALECD>
             <DSCR>Ceres Urtinkturen gemäss L2 mit -- im Kommentar</DSCR>
+            <DSCRF/>
         </PRODUCT>),
              "Chapter 70 item" => %(<ITEM PHARMATYPE="P">
             <GTIN>2500000588532</GTIN>
             <PHAR>2069639</PHAR>
             <SALECD>A</SALECD>
             <DSCR>EINF ARZNEI Ceres Urtinktur spez 20ml</DSCR>
+            <DSCRF/>
             <PEXF>23.44</PEXF>
             <PPUB>31.30</PPUB>
             <!--Chapter70 hack 2500000588532 EINF ARZNEI Ceres Urtinktur spez 20ml-->
@@ -482,6 +487,7 @@ Der behandelnde Arzt ist verpflichtet, die erforderlichen Daten laufend im vorge
             <PRODNO>1336901</PRODNO>
             <SALECD>A</SALECD>
             <DSCR>Pethidin HCl Amino 100 mg/2 ml, Injektionslösung</DSCR>
+            <DSCRF/>
             <ATC>N02AB02</ATC>
         </PRODUCT>)}
 

data/spec/parslet_spec.rb

@@ -1,5 +1,5 @@
 VERBOSE_MESSAGES = false
-if File.exists?("#{Dir.pwd}/lib/oddb2xml/parslet_compositions.rb")
+if File.exist?("#{Dir.pwd}/lib/oddb2xml/parslet_compositions.rb")
   require_relative "../lib/oddb2xml/parslet_compositions"
 else
   puts :ParseFailed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.7.9
+  version: 2.8.1
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -411,13 +411,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
+- ".github/workflows/codeql.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".standard.yml"
 - Elexis_Artikelstamm_v003.xsd
 - Elexis_Artikelstamm_v5.xsd
 - Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - Manifest.txt
@@ -434,6 +438,9 @@ files:
 - data/gtin2ignore.yaml
 - data/product_overrides.yaml
 - dokumentation_calc.textile
+- flake.lock
+- flake.nix
+- gemset.nix
 - lib/oddb2xml.rb
 - lib/oddb2xml/builder.rb
 - lib/oddb2xml/calc.rb
@@ -453,7 +460,6 @@ files:
 - oddb2xml.gemspec
 - oddb2xml.xsd
 - oddb_calc.xsd
-- shell.nix
 - spec/artikelstamm_spec.rb
 - spec/builder_spec.rb
 - spec/calc_spec.rb
@@ -529,7 +535,7 @@ homepage: https://github.com/zdavatz/oddb2xml
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -544,8 +550,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
-signing_key:
+rubygems_version: 3.4.5
+signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.
 test_files:

data/shell.nix

@@ -1,19 +0,0 @@
-# See https://nixos.wiki/wiki/Packaging/Ruby
-# A small helper script to get a development version for oddb2xml under NixOS
-with import <nixpkgs> {};
-stdenv.mkDerivation {
-  name = "env";
-  buildInputs = [
-    ruby_3_1
-    rubyPackages_3_0.safe_yaml
-    ruby_3_1.devEnv
-    git
-    python
-    libpcap
-    libxml2
-    libxslt
-    pkg-config
-    bundix
-    gnumake
-  ];
-}