oddb2xml 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c142b0dfeb3bb43d540e7d9837b5199d5e2eb7c5afbd07fe278f8e4b40516e
-  data.tar.gz: d9dad26c7d08193bc3af27262ebfd32f0edce7d4c56e457d6d3cfabf845900c7
+  metadata.gz: 3a0a4cbd5ff288013064ffb6d756ed0961fd98e52b6960fbfd32b4328a039369
+  data.tar.gz: 60c9943c0a7f344ecf87e04f16314da1b8a29e0801a8d7e814d265932f89e443
 SHA512:
-  metadata.gz: bd8480feba005844d3d2dd46f31a69bce0cdf076a75c041eeed53808a66733cb821cdc6633ae82cbba4a1347822ec123bf2ed594609145ceb8c3227ab06f7433
-  data.tar.gz: ebee25f81ef3c9f56c748175fca7d8c12c1894a3ba5db1d94d4c494f0deb223192af0f727cf567921981ce00e99f412789ba92a1cd5ae11f8c80d745dba99cfa
+  metadata.gz: 75abbcde0acf8e33b8489dd03fc06e6bd8796f571444b0a7f7eb3cded37a25f0938d8db07a7ef6ef0023412e3ab2336c046be3447fb5dc371dd02f06c5950e12
+  data.tar.gz: 9cf7e4c5eecd5d708dea61b4c6e17a206f6f4eaa65742ae2ee0c7ea3a49d0b4e4ae2dad7d9ffd3c2e61191e8703693ea29b3aa194d517226f828282ff5b3f891

data/CLAUDE.md

@@ -37,7 +37,7 @@ The system follows a **download → extract → build → compress** pipeline:
 
 1. **CLI** (`lib/oddb2xml/cli.rb`) — Entry point. Parses options via Optimist (`options.rb`), orchestrates the pipeline, manages multi-threaded downloads.
 
-2. **Downloaders** (`lib/oddb2xml/downloader.rb`) — 11 subclasses of `Downloader`, each fetching from a specific Swiss data source. Files cached in `./downloads/`.
+2. **Downloaders** — 11 subclasses of `Downloader`, each fetching from a specific Swiss data source. 10 live in `lib/oddb2xml/downloader.rb`; the FHIR downloader lives in `lib/oddb2xml/fhir_support.rb`. Files cached in `./downloads/`.
 
 3. **Extractors** (`lib/oddb2xml/extractor.rb`) — Matching extractor classes that parse downloaded files into Ruby hashes. Formats include XML (nokogiri/sax-machine), XLSX (rubyXL), CSV, and fixed-width text. Refdata uses the new SwissReg XML format from a zip download (`files.refdata.ch`).
 
@@ -47,6 +47,8 @@ The system follows a **download → extract → build → compress** pipeline:
 
 6. **Compressor** (`lib/oddb2xml/compressor.rb`) — Optional ZIP/TAR.GZ output compression.
 
+7. **FHIR support** (`lib/oddb2xml/fhir_support.rb`) — Self-contained module providing `FhirDownloader` and FHIR NDJSON parsing. Activated via `--fhir` (or `--fhir-url=<URL>`). Downloads per-language NDJSON files (`foph-sl-export-latest-{de,fr,it}.ndjson`) from `epl.bag.admin.ch` to populate French and Italian product names/descriptions. Maps legal status codes `756005022007` and `756005022008` to Swissmedic category D.
+
 ### Key data identifiers
 - **GTIN/EAN13**: Primary article identifier (13-digit barcode)
 - **Pharmacode**: Swiss pharmacy code

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (3.0.3)
+    oddb2xml (3.0.4)
       htmlentities
       httpi
       mechanize (>= 2.8.5)

data/History.txt

@@ -1,3 +1,6 @@
+=== 3.0.4 / 24.04.2026
+* Firstbase: switch -b/--firstbase from the deprecated pillbox.oddb.org XLSX to the GS1 Switzerland CSV at https://id.gs1.ch/01/07612345000961 (full firstbase barcode registry, ~189k items). Downloaded file is now firstbase.csv; FirstbaseExtractor now parses CSV with headers instead of XLSX.
+
 === 3.0.3 / 24.04.2026
 * FHIR: download per-language NDJSON files (foph-sl-export-latest-{de,fr,it}.ndjson) so French and Italian product names/descriptions are populated
 * FHIR: map legal status code 756005022008 to Swissmedic category D (in addition to 756005022007)

data/README.md

@@ -51,7 +51,7 @@ HIN (http://hin.ch) creates daily the actual file. They can be downloaded from `
 see `--help`.
 
 ```
-    /opt/src/oddb2xml_v5/bin/oddb2xml version 2.4.3
+    /opt/src/oddb2xml/bin/oddb2xml version 3.0.4
     Usage:
     oddb2xml [option]
       produced files are found under data
@@ -61,6 +61,10 @@ see `--help`.
     -e, --extended            pharma, non-pharma plus prices and non-pharma from zurrose.
                                                           Products without EAN-Code will also be listed.
                                                           File oddb_calc.xml will also be generated
+    --fhir                    Use FHIR NDJSON format from FOPH/BAG instead of XML
+                                                          from Spezialitätenliste. Downloads per-language
+                                                          NDJSON files (de, fr, it) from epl.bag.admin.ch.
+    --fhir-url=<s>            Specific FHIR NDJSON URL to download (implies --fhir)
     -f, --format=<s>          File format F, default is xml. {xml|dat}
                                                           If F is given, -o option is ignored. (Default: xml)
     -i, --include             Include target option for ean14  for 'dat' format.
@@ -80,6 +84,8 @@ see `--help`.
                                                           Downloaded files are saved under downloads
     --log                     log important actions
     -u, --use-ra11zip=<s>     Use the ra11.zip (a zipped transfer.dat from Galexis)
+    -b, --firstbase           Build all NONPHARMA articles on firstbase
+                                                          (GS1 Switzerland CSV from id.gs1.ch)
     -v, --version             Print version and exit
     -h, --help                Show this message
 ```
@@ -106,8 +112,8 @@ FR
 
 ## Supported ruby version
 
-We run tests on travis-ci.org for the Ruby versions mentioned in the .travis.yml file. You will need ruby > 2.5 to work correctly.
-Look at the github actions to see the spec test results. We ignore errors against ruby head, as it is sometimes unstable.
+You will need ruby >= 2.5 to work correctly. Current development happens on Ruby 3.2 (`.ruby-version`).
+CI runs on Ruby 3.0, 3.1 and 3.2 via GitHub Actions — see the badge above for the latest spec results.
 
 
 ## XSD files
@@ -283,6 +289,8 @@ We use the following files:
 * http://download.swissmedicinfo.ch/ (AipsDownload)
 * https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/LPPV.txt
 * https://raw.githubusercontent.com/zdavatz/cpp2sqlite/master/input/atc_codes_multi_lingual.txt
+* https://epl.bag.admin.ch/static/fhir/foph-sl-export-latest-{de,fr,it}.ndjson (FHIR NDJSON, used with `--fhir`)
+* https://id.gs1.ch/01/07612345000961 (GS1 Switzerland firstbase CSV — full barcode registry, used with `-b`/`--firstbase`)
 
 ## Rules for matching GTIN (aka EAN13), product number and IKSNR
 

data/lib/oddb2xml/downloader.rb

@@ -342,14 +342,14 @@ module Oddb2xml
   end
 
   class FirstbaseDownloader < Downloader
-    BASE_URL = "http://pillbox.oddb.org"
+    BASE_URL = "https://id.gs1.ch/01/07612345000961"
     include DownloadMethod
     def initialize(type = :orphan, options = {})
-      @url = BASE_URL + "/firstbase.xlsx"
+      @url = BASE_URL
     end
 
     def download
-      @file2save = File.join(DOWNLOADS, "firstbase.xlsx")
+      @file2save = File.join(DOWNLOADS, "firstbase.csv")
       report_download(@url, @file2save)
       begin
         download_as(@file2save, "w+")

data/lib/oddb2xml/extractor.rb

@@ -608,32 +608,28 @@ module Oddb2xml
 
   class FirstbaseExtractor < Extractor
     def initialize(file)
-      @sheet = RubyXL::Parser.parse(file).worksheets[0]
+      @file = file
     end
 
     def to_hash
       data = {}
-      return data unless @sheet
-      @sheet.each_with_index do |row, i|
-        next if i <= 1
-        if row.nil?
-          puts "Empty row (#{i}) in firstbase"
-          next
-        end
-        gtin = row[0].value.to_s.gsub(/^0+/, '')
+      return data unless @file && File.exist?(@file)
+      CSV.foreach(@file, headers: true, encoding: "UTF-8") do |row|
+        gtin = row["Gtin"].to_s.gsub(/^0+/, "")
+        next if gtin.empty?
         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: "",
+          gln: row["InformationProviderGln"].to_s,
+          target_market: row["TargetMarketCountryCode"].to_s,
+          gpc: row["GpcCategoryCode"].to_s,
+          trade_item_description_de: row["TradeItemDescription_DE"].to_s,
+          trade_item_description_en: "",
+          trade_item_description_fr: row["TradeItemDescription_FR"].to_s,
+          trade_item_description_it: row["TradeItemDescription_IT"].to_s,
+          manufacturer_name: row["InformationProviderPartyName"].to_s,
+          start_availability_date: row["Date_Created_Batch"].to_s,
+          gross_weight: "",
+          net_weight: "",
         }
       end
       data

data/lib/oddb2xml/options.rb

@@ -45,7 +45,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
+        opt :firstbase, "Build all NONPHARMA articles on firstbase (GS1 Switzerland CSV from id.gs1.ch)", short: "b", default: false
       end
 
       @opts[:percent] = @opts[:increment]

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger