oddb2xml 3.0.14 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48a674b29560c021e581fdbcd060a0bcf58f618ce853a93a54e8a7504bbb3f0a
-  data.tar.gz: ac3fc397a257b03a51f760299241c9865c325b22c3bb1b57ba76a0dcfa5fcb59
+  metadata.gz: 5cba5ea3e5414179cae06dc6b1fd3e30882ebf93d158cebbbf8c384789c6f437
+  data.tar.gz: 96e18c2cfbd07cacb6266659b4995e2fdddc04b1e1dafea9410df0423ae91ae8
 SHA512:
-  metadata.gz: bd0da98d7f153c459f0f8548f56c1ac416752ee9e05aafe2cb2bf5965e1f88c7bab1272237210b7ead8079b6f8d564eeca187801348d26763439dc6133a8c490
-  data.tar.gz: 7b53c6f9ed2f363bbae51c2f8d6cbce456774534f08045def0248a13a22a8e17c2e723f093936e6d607c02d7e3da95e74eb00945bdae6fd393f0aac6fa1da8fc
+  metadata.gz: 32bc1b4476bd33f7f3c04aae1f63bb7ddca649d7ca7b73942d321bda32102629ec879f3e3ac414073f72f11687752a4d113e1688b52f0c6466b45f866fddcc7c
+  data.tar.gz: fbecd040c7a10958075a6754a6b7a492d88181a0530a73112db6cbf0e51f13060a849b53689575515c98c72e93a20bc1744afd1d87eb376aeeacf0282e1592fe

data/CLAUDE.md

@@ -49,7 +49,7 @@ The system follows a **download → extract → build → compress** pipeline:
 
 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. Reads the BAG **Indikationscode** (`XXXXX.NN`) from the explicit `indicationCode` extension on each `RegulatedAuthorization.indication[].extension[regulatedAuthorization-limitation]` (BAG SL FHIR export >= v2.0.5; handled from 3.0.10). The BAG changelog states the limitation code (`ClinicalUseDefinition.id`) and the indication code are **independent** fields, so the older derivation — combining each indication CUD's `.NN` id-suffix with the reimbursement RA's `FOPHDossierNumber` — is kept only as a fallback for feeds lacking the extension. Exposed as `item[:indication_codes]` and per-package `:indication_codes` (each entry a `{code:, cud_id:, text:}` hash, where `cud_id` is the `limitationIndication` CUD reference used to resolve the text). From 3.0.7 onwards, `Builder#build_product` emits one `<INDICATION_CODE code="XXXXX.NN" cud_id="DRUG.NN">limitation text</INDICATION_CODE>` child per indication on every `<PRD>` in `oddb_product.xml`; live feed numbers: 539 products / 1,293 codes / 100 % with non-empty indication text. Mandatory on prescriptions/invoices for SL price-model drugs from 2026-07-01 — see issue [#113](https://github.com/zdavatz/oddb2xml/issues/113). **Limitation texts** (3.0.8 onwards): the `regulatedAuthorization-limitation` extension has no inline `limitationText` in the live BAG feed — it carries a `limitationIndication` reference to a `ClinicalUseDefinition` whose `indication.diseaseSymptomProcedure.concept.text` is the actual text. The parser stores the ref as `cud_ref` on each Limitation, `Bundle#cud_text_by_id` resolves DE, and `merge_language` propagates FR/IT from the per-language NDJSON files via the same CUD id. Coverage on the live feed jumped from 0 / 9'108 to 9'108 / 9'108 (issue [#116](https://github.com/zdavatz/oddb2xml/issues/116)). **Limitation code / LIMNAMEBAG** (3.0.12 onwards): FHIR has no native BAG limitation code (LIMCD), so `create_limitations_for_package` sets `LimitationCode = cud_ref` (the `limitationIndication` CUD id) instead of `""`. Without this, every FHIR limitation shared an empty `:code`; `Builder#build_artikelstamm` groups its `<LIMITATIONS>` section by code, so all of them collapsed into a single `<LIMITATION>` with an empty `<LIMNAMEBAG>` and only one text survived. Using the CUD id as the key makes each distinct limitation emit and be referenced from its `<PRODUCT>`. The downstream `bin/check_artikelstamm` (`semantic_check.rb`) also crashed on the lone-element output because Ox `:hash_no_attrs` collapses a one-child section into a Hash (and an empty one into nil) — `SemanticCheckXML#get_items` now normalises every section to an Array.
 
-8. **Refdata cleanup** (`lib/oddb2xml/refdata_cleanup.rb`) — Compensates for known data-quality issues in upstream Refdata.Articles.xml before they reach the output. Each fix is guarded by a Swissmedic-side heuristic (e.g. comma in `substance_swissmedic` to distinguish mono products from real combinations). Currently fixes (a) the doubled-dose template bug (`X mg / X mg / Stk`, `fix_double_dose`, guarded by `single_substance?`) and (b) the spelled-out German galenic form `Retardtabletten` → house-style abbreviation `Ret Tabl` (`normalize_galenic_form` / `GALENIC_NORMALISATIONS`, issue #112 case #13, e.g. RINVOQ — a narrow word-boundary substitution that leaves legitimate brand suffixes like `TRAMAL retard` and Mepha's `Lactab` untouched). Called from `Builder#apply_refdata_description_cleanups!` at the start of `prepare_articles`. See GitHub issue #112 for the catalogue.
+8. **Refdata cleanup** (`lib/oddb2xml/refdata_cleanup.rb`) — Compensates for known data-quality issues in upstream Refdata.Articles.xml before they reach the output. Each fix is guarded by a Swissmedic-side heuristic (e.g. comma in `substance_swissmedic` to distinguish mono products from real combinations). Currently fixes (a) the doubled-dose template bug (`X mg / X mg / Stk`, `fix_double_dose`, guarded by `single_substance?`); (b) the spelled-out German galenic form `Retardtabletten` → house-style abbreviation `Ret Tabl` (`normalize_galenic_form` / `GALENIC_NORMALISATIONS`, issue #112 case #13, e.g. RINVOQ — a narrow word-boundary substitution that leaves legitimate brand suffixes like `TRAMAL retard` and Mepha's `Lactab` untouched); and (c) dose info Refdata dropped from `<FullName>`, sourced from the Swissmedic composition string `pack[:composition_swissmedic]` — `fix_missing_combo_dose` (#6, appends a combination's 2nd component strength), `fix_missing_dose` (#4, inserts a mono product's missing strength before the pack count), `fix_missing_volume` (#7, appends an injectable's per-pen volume); and (d) 50-char-truncation repairs — `fix_truncated_metoject` (#1, rebuilds METOJECT Autoinjektor names from the intact `<brand> Autoinjektor <dose>/<vol>` prefix + Swissmedic `size`, localised DE/FR/IT) and `fix_truncated_volume_unit` (#3, restores the cut `ml` of the VERACTIV Vitamin D3 drops). The (c) and (d) fixes are scoped to explicit IKSNR allow-lists (`COMBO_DOSE_IKSNR`/`MISSING_DOSE_IKSNR`/`MISSING_VOLUME_IKSNR`/`METOJECT_IKSNR`/`VERACTIV_VITD3_IKSNR`): a dry run proved a blanket heuristic mis-fires on hundreds of legitimate names (sodium counter-ion doses, strength-less phyto/powder products, concentration names like `CIMZIA 200 mg/ml`), so only catalogued registrations are touched — add an IKSNR to grow coverage. Called from `Builder#apply_refdata_description_cleanups!` at the start of `prepare_articles`. See GitHub issue #112 for the catalogue.
 
 9. **Chapter-70 hack** (`lib/oddb2xml/chapter_70_hack.rb`) — Legacy scraper for the SL "Komplementärarzneimittel" products (homeopathic/anthroposophic/phytotherapeutic), called only from `Builder#build_artikelstamm`. **Deprecated / non-FHIR only (3.0.11 onwards):** the source page `varia_De.htm` was rebuilt as a JavaScript SPA with no static data table, so the scraper now returns nothing there. These products + limitations now come through the FHIR feed (SL classification `20. KOMPLEMENTÄRARZNEIMITTEL`, 221 products on the live DE feed with real GTINs and limitation texts), so `build_artikelstamm` **skips the scraper entirely when `@options[:fhir]`** (the default for `--artikelstamm` since 3.0.9). In `--no-fhir` mode the scraper degrades gracefully (skips non-row/`<script>` nodes and empty tables, warns, returns `[]`) instead of raising `NoMethodError`. See GitHub issue #118.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (3.0.14)
+    oddb2xml (3.0.16)
       csv
       htmlentities
       httpi

data/History.txt

@@ -1,3 +1,9 @@
+=== 3.0.16 / 02.06.2026
+* Refdata cleanup: two more Swissmedic-sourced, IKSNR-scoped fixes for 50-char truncation (issue #112 cases #1 and #3). fix_truncated_metoject rebuilds every truncated METOJECT Autoinjektor name ("METOJECT Autoinjektor 10 mg/0.2 ml Inj Lös 10 mg 1") from its intact "<brand> Autoinjektor <dose>/<vol>" prefix plus the authoritative Swissmedic pack size -> "METOJECT Autoinjektor 10 mg/0.2 ml Fertpen 1 Stk", localised for FR ("stylo pré … pce") and IT ("penna preriempita … pz"); it recovers the correct count even where the truncation cut the count digits. fix_truncated_volume_unit restores the lost final "l" of the VERACTIV Vitamin D3 drops volume ("… 20'000 U.I. 10m" -> "10ml"). Both are scoped to their registration (METOJECT 65672, VERACTIV Vitamin D3 57690) and idempotent. The French wording in the VERACTIV German name remains an upstream issue.
+
+=== 3.0.15 / 02.06.2026
+* Refdata cleanup: reconstruct dose information that Refdata dropped from <FullName>, sourcing the authoritative values from the Swissmedic "Zugelassene Packungen" composition string (issue #112 cases #4/#6/#7). Three new guarded fixes in RefdataCleanup: fix_missing_combo_dose appends a combination's 2nd component strength ("ATOVAQUON PLUS … 250 mg" -> "250 mg / 100 mg"), fix_missing_dose inserts a mono product's missing strength before the pack count ("CETIRIZIN Spirig HC Filmtabl 30 Stk" -> "… 10 mg 30 Stk"), and fix_missing_volume appends an injectable's per-pen volume ("MOUNJARO KwikPen … 7.5 mg" -> "7.5 mg/0.6 ml"). Each fix is scoped to an explicit IKSNR allow-list: a dry run showed a blanket heuristic mis-fires on hundreds of legitimate names (sodium counter-ion doses, strength-less phyto/powder products, concentration names), so only the catalogued registrations are touched. Add an IKSNR to grow coverage.
+
 === 3.0.14 / 02.06.2026
 * Refdata cleanup: normalise the spelled-out German galenic form "Retardtabletten" to the Refdata house-style abbreviation "Ret Tabl" (issue #112 case #13, e.g. RINVOQ). Only 3 of the ~940 retard-tablet descriptions deviated from the convention; the fix is a narrow, German-only word-boundary substitution (RefdataCleanup.normalize_galenic_form, wired into Builder#apply_refdata_description_cleanups!). Legitimate brand suffixes ("TRAMAL retard", "XANAX retard", "MELATONIN Spirig HC retard") and Mepha's "Lactab" are left untouched.
 

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/bin/oddb2xml version 3.0.14
+    /opt/src/oddb2xml/bin/oddb2xml version 3.0.16
     Usage:
     oddb2xml [option]
       produced files are found under data

data/lib/oddb2xml/builder.rb

@@ -95,8 +95,7 @@ module Oddb2xml
       return if @refdata_descriptions_cleaned
       @refdata_descriptions_cleaned = true
       return if @refdata.nil? || @refdata.empty?
-      double_dose_fixed = 0
-      galenic_fixed = 0
+      counts = Hash.new(0)
       @refdata.each_value do |item|
         next unless item.is_a?(Hash)
         no8 = item[:no8]
@@ -104,26 +103,38 @@ module Oddb2xml
         pack = @packs[no8]
         next unless pack
         substance = pack[:substance_swissmedic]
+        composition = pack[:composition_swissmedic]
+        size = pack[:size]
         [:desc_de, :desc_fr, :desc_it].each do |key|
           original = item[key]
-          cleaned = RefdataCleanup.fix_double_dose(original, substance)
-          if cleaned != original
-            item[key] = cleaned
-            double_dose_fixed += 1
-          end
-          original = item[key]
-          cleaned = RefdataCleanup.normalize_galenic_form(original)
-          if cleaned != original
-            item[key] = cleaned
-            galenic_fixed += 1
+          next if original.nil? || original.empty?
+          desc = original
+          # Applied in order so later fixes see the output of earlier ones.
+          pipeline = [
+            [:metoject, ->(d) { RefdataCleanup.fix_truncated_metoject(d, no8, size) }],
+            [:veractiv_vol, ->(d) { RefdataCleanup.fix_truncated_volume_unit(d, no8) }],
+            [:double_dose, ->(d) { RefdataCleanup.fix_double_dose(d, substance) }],
+            [:galenic, ->(d) { RefdataCleanup.normalize_galenic_form(d) }],
+            [:combo_dose, ->(d) { RefdataCleanup.fix_missing_combo_dose(d, substance, composition, no8) }],
+            [:missing_dose, ->(d) { RefdataCleanup.fix_missing_dose(d, substance, composition, no8) }],
+            [:volume, ->(d) { RefdataCleanup.fix_missing_volume(d, composition, no8) }]
+          ]
+          pipeline.each do |rule, fix|
+            cleaned = fix.call(desc)
+            if cleaned != desc
+              desc = cleaned
+              counts[rule] += 1
+            end
           end
+          item[key] = desc if desc != original
         end
       end
-      if double_dose_fixed > 0
-        Oddb2xml.log("Refdata cleanup: fixed double-dose pattern in #{double_dose_fixed} description(s)")
-      end
-      if galenic_fixed > 0
-        Oddb2xml.log("Refdata cleanup: normalised galenic form in #{galenic_fixed} description(s)")
+      labels = {metoject: "truncated METOJECT name", veractiv_vol: "truncated volume unit",
+                double_dose: "double-dose pattern", galenic: "galenic form",
+                combo_dose: "missing combo 2nd dose", missing_dose: "missing strength",
+                volume: "missing injection volume"}
+      counts.each do |rule, n|
+        Oddb2xml.log("Refdata cleanup: fixed #{labels[rule]} in #{n} description(s)") if n > 0
       end
     end
 

data/lib/oddb2xml/refdata_cleanup.rb

@@ -48,5 +48,151 @@ module Oddb2xml
       return desc if desc.nil? || desc.empty?
       GALENIC_NORMALISATIONS.reduce(desc) { |result, (re, repl)| result.gsub(re, repl) }
     end
+
+    # The following three fixes reconstruct dose information that Refdata
+    # dropped from <FullName>, sourcing the authoritative values from the
+    # Swissmedic "Zugelassene Packungen" composition string (already loaded as
+    # pack[:composition_swissmedic], keyed by the same SwissmedicNo8). See
+    # issue #112 cases #4 (missing strength), #6 (missing 2nd combo component)
+    # and #7 (missing injection volume).
+    #
+    # Each fix is scoped to an explicit allow-list of Swissmedic registration
+    # numbers (IKSNR, the first 5 digits of the no8). A blanket heuristic is
+    # NOT safe: a dry run over the full Refdata feed mis-fired on hundreds of
+    # legitimate names — combination detection grabbed sodium counter-ion doses
+    # ("KEPPRA … / 2.8 mg"), the missing-strength rule fired on strength-less
+    # phyto/powder products ("IMPORTAL Pulver"), and the volume rule corrupted
+    # concentration names ("CIMZIA 200 mg/ml"). Restricting to the catalogued
+    # registrations keeps the Swissmedic-derived value while touching only the
+    # known-bad products. Add an IKSNR here once a new case is confirmed.
+    COMBO_DOSE_IKSNR = %w[65280].freeze      # #6 ATOVAQUON PLUS Spirig HC
+    MISSING_DOSE_IKSNR = %w[62568].freeze    # #4 CETIRIZIN Spirig HC
+    MISSING_VOLUME_IKSNR = %w[69696].freeze  # #7 MOUNJARO KwikPen
+
+    def self.iksnr_of(no8)
+      no8.to_s[0, 5]
+    end
+
+    # Builds a whitespace-tolerant matcher for a normalised dose value like
+    # "250 mg" so it also matches "250mg" in a description.
+    def self.dose_regex(dose)
+      m = dose.to_s.match(/\A([\d.,]+)\s*(.+?)\s*\z/)
+      return /#{Regexp.escape(dose.to_s)}/i unless m
+      /(?<![\d.,])#{Regexp.escape(m[1])}\s*#{Regexp.escape(m[2])}/i
+    end
+
+    # Returns the dose token that belongs to a named active substance in the
+    # Swissmedic composition, normalised to "<number> <unit>" (e.g.
+    # dose_for_substance(comp, "atovaquonum") => "250 mg"). Matches within the
+    # comma-delimited segment that names the substance so excipient doses are
+    # never picked up. Returns nil if absent.
+    def self.dose_for_substance(composition, substance)
+      return nil if composition.nil? || substance.nil?
+      key = substance.to_s.strip[/\A[A-Za-zÀ-ÿ]+/]
+      return nil if key.nil? || key.empty?
+      composition.split(",").each do |segment|
+        next unless /\b#{Regexp.escape(key)}/i.match?(segment)
+        m = segment.match(DOSE_TOKEN)
+        next unless m
+        parts = m[0].match(/\A([\d.,]+)\s*(.+?)\s*\z/)
+        return parts ? "#{parts[1]} #{parts[2]}" : m[0].strip
+      end
+      nil
+    end
+
+    # Case #6: a real combination product whose Refdata description carries
+    # only the first component's strength (e.g. "ATOVAQUON PLUS … 250 mg …").
+    # Appends the second active's strength from Swissmedic, producing
+    # "… 250 mg / 100 mg …". No-op for mono products, 3+ component combos, or
+    # when the second strength is already present.
+    def self.fix_missing_combo_dose(desc, swissmedic_substance, composition, no8)
+      return desc if desc.nil? || desc.empty?
+      return desc unless COMBO_DOSE_IKSNR.include?(iksnr_of(no8))
+      return desc if single_substance?(swissmedic_substance)
+      subs = swissmedic_substance.to_s.split(",").map(&:strip)
+      return desc unless subs.size == 2
+      d1 = dose_for_substance(composition, subs[0])
+      d2 = dose_for_substance(composition, subs[1])
+      return desc unless d1 && d2
+      return desc unless dose_regex(d1).match?(desc)
+      return desc if dose_regex(d2).match?(desc)
+      desc.sub(dose_regex(d1)) { |hit| "#{hit} / #{d2}" }
+    end
+
+    # Case #4: a mono product whose Refdata description carries NO strength at
+    # all (e.g. "CETIRIZIN Spirig HC Filmtabl 10 Stk"). Inserts the single
+    # active's strength from Swissmedic before the trailing "<count> <unit>"
+    # group → "CETIRIZIN Spirig HC Filmtabl 10 mg 10 Stk". No-op when a
+    # strength is already present or no trailing pack count exists.
+    def self.fix_missing_dose(desc, swissmedic_substance, composition, no8)
+      return desc if desc.nil? || desc.empty?
+      return desc unless MISSING_DOSE_IKSNR.include?(iksnr_of(no8))
+      return desc unless single_substance?(swissmedic_substance)
+      return desc if DOSE_TOKEN.match?(desc)
+      dose = dose_for_substance(composition, swissmedic_substance)
+      return desc unless dose
+      return desc unless /\s\d[\d.,']*\s+\S+\s*\z/.match?(desc)
+      desc.sub(/(\s)(\d[\d.,']*\s+\S+\s*)\z/, "\\1#{dose} \\2")
+    end
+
+    # Case #7: an injectable pen/solution whose Refdata description gives the
+    # strength but not the per-pen volume (e.g. "MOUNJARO KwikPen Inj Lös
+    # 7.5 mg 1 Stk"). Appends "/<vol> ml" taken from the Swissmedic
+    # composition ("… pro 0.6 ml …") → "… 7.5 mg/0.6 ml 1 Stk". Only fires for
+    # injectable forms that have no volume anywhere in the name yet.
+    def self.fix_missing_volume(desc, composition, no8)
+      return desc if desc.nil? || desc.empty?
+      return desc unless MISSING_VOLUME_IKSNR.include?(iksnr_of(no8))
+      return desc unless /\b(?:Inj|Fertpen|Injektor|stylo|sol\b)/i.match?(desc)
+      return desc if /\d\s*ml\b/i.match?(desc)
+      vol = composition.to_s[/\bpro\s+([\d.,]+)\s*ml\b/i, 1]
+      return desc unless vol
+      m = desc.match(/\d+(?:[.,]\d+)?\s*mg/i)
+      return desc unless m
+      desc.sub(m[0], "#{m[0]}/#{vol} ml")
+    end
+
+    METOJECT_IKSNR = %w[65672].freeze  # #1 METOJECT Autoinjektor
+
+    # Localised "<pen> … <count> <unit>" suffix, selected by the galenic-form
+    # token Refdata uses per language. The "<brand> Autoinjektor <dose>/<vol>"
+    # prefix is identical across DE/FR/IT, so only the suffix is localised.
+    METOJECT_SUFFIX = {
+      /\bInj Lös\b/ => ["Fertpen", "Stk"],         # DE
+      /\binj sol\b/ => ["stylo pré", "pce"],       # FR
+      /\bsol inj\b/ => ["penna preriempita", "pz"] # IT
+    }.freeze
+
+    # Case #1: every METOJECT Autoinjektor name is truncated at Refdata's
+    # 50-char limit, carrying a redundant strength in the (often cut) tail
+    # ("METOJECT Autoinjektor 10 mg/0.2 ml Inj Lös 10 mg 1"). Rebuild from the
+    # intact prefix plus the authoritative Swissmedic pack size →
+    # "METOJECT Autoinjektor 10 mg/0.2 ml Fertpen 1 Stk" (localised for FR/IT).
+    # Scoped to the METOJECT registration; idempotent once Refdata stops
+    # truncating (the rebuilt name no longer carries the redundant tail).
+    def self.fix_truncated_metoject(desc, no8, size)
+      return desc if desc.nil? || desc.empty?
+      return desc unless METOJECT_IKSNR.include?(iksnr_of(no8))
+      return desc if size.nil? || size.to_s.empty?
+      m = desc.match(%r{\A(METOJECT Autoinjektor \d[\d.]* mg/\d[\d.]* ml)\b})
+      return desc unless m
+      suffix = METOJECT_SUFFIX.find { |re, _| re.match?(desc) }
+      return desc unless suffix
+      pen, unit = suffix.last
+      "#{m[1]} #{pen} #{size} #{unit}"
+    end
+
+    VERACTIV_VITD3_IKSNR = %w[57690].freeze  # #3 VERACTIV Vitamin D3 Wild
+
+    # Case #3 (partial): the VERACTIV Vitamin D3 drops are truncated at 50
+    # chars, losing the final "l" of the volume ("… 20'000 U.I. 10m" → "10ml").
+    # Restore it. The French wording ("Huile", drop-form codes) in the German
+    # name is a separate upstream issue and is left untouched. Scoped to the
+    # registration; a no-op once the volume already ends in "ml".
+    def self.fix_truncated_volume_unit(desc, no8)
+      return desc if desc.nil? || desc.empty?
+      return desc unless VERACTIV_VITD3_IKSNR.include?(iksnr_of(no8))
+      desc.sub(/(\d)\s*m\z/, '\1ml')
+    end
   end
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "3.0.14"
+  VERSION = "3.0.16"
 end

data/spec/refdata_cleanup_spec.rb

@@ -92,6 +92,142 @@ describe Oddb2xml::RefdataCleanup do
       expect(described_class.normalize_galenic_form(input)).to eq input
     end
   end
+
+  describe ".dose_for_substance" do
+    let(:comp) { "atovaquonum 250 mg, proguanili hydrochloridum 100 mg, cellulosum microcristallinum" }
+
+    it "returns the dose of the named active, normalised to '<n> <unit>'" do
+      expect(described_class.dose_for_substance(comp, "atovaquonum")).to eq "250 mg"
+      expect(described_class.dose_for_substance(comp, "proguanili hydrochloridum")).to eq "100 mg"
+    end
+
+    it "ignores excipient doses outside the substance's segment" do
+      cetirizin = "cetirizini dihydrochloridum 10 mg, lactosum monohydricum 65 mg"
+      expect(described_class.dose_for_substance(cetirizin, "cetirizini dihydrochloridum")).to eq "10 mg"
+    end
+
+    it "returns nil when the substance is absent" do
+      expect(described_class.dose_for_substance(comp, "ibuprofenum")).to be_nil
+      expect(described_class.dose_for_substance(nil, "atovaquonum")).to be_nil
+    end
+  end
+
+  describe ".fix_missing_combo_dose (issue #112 #6)" do
+    let(:combo) { "atovaquonum, proguanili hydrochloridum" }
+    let(:comp) { "atovaquonum 250 mg, proguanili hydrochloridum 100 mg, cellulosum microcristallinum" }
+
+    it "appends the 2nd combo component dose for the catalogued IKSNR (ATOVAQUON, 65280)" do
+      input = "ATOVAQUON PLUS Spirig HC Filmtabl 250 mg 12 Stk"
+      expect(described_class.fix_missing_combo_dose(input, combo, comp, "65280001"))
+        .to eq "ATOVAQUON PLUS Spirig HC Filmtabl 250 mg / 100 mg 12 Stk"
+    end
+
+    it "is a no-op for non-catalogued registrations (avoids the KEPPRA sodium misfire)" do
+      input = "KEPPRA Filmtabl 1000 mg 100 Stk"
+      keppra_comp = "levetiracetamum 1000 mg, ... corresp. natrium 2.8 mg"
+      expect(described_class.fix_missing_combo_dose(input, "levetiracetamum, natrium", keppra_comp, "29152001"))
+        .to eq input
+    end
+
+    it "is a no-op when the 2nd dose is already present" do
+      input = "ATOVAQUON PLUS Spirig HC Filmtabl 250 mg / 100 mg 12 Stk"
+      expect(described_class.fix_missing_combo_dose(input, combo, comp, "65280001")).to eq input
+    end
+
+    it "is a no-op for mono products" do
+      input = "X 250 mg 12 Stk"
+      expect(described_class.fix_missing_combo_dose(input, "atovaquonum", comp, "65280001")).to eq input
+    end
+  end
+
+  describe ".fix_missing_dose (issue #112 #4)" do
+    let(:comp) { "cetirizini dihydrochloridum 10 mg, lactosum monohydricum 65 mg, talcum" }
+    let(:sub) { "cetirizini dihydrochloridum" }
+
+    it "inserts the strength before the pack count for the catalogued IKSNR (CETIRIZIN, 62568)" do
+      expect(described_class.fix_missing_dose("CETIRIZIN Spirig HC Filmtabl 30 Stk", sub, comp, "62568007"))
+        .to eq "CETIRIZIN Spirig HC Filmtabl 10 mg 30 Stk"
+    end
+
+    it "works on French/Italian pack-count units" do
+      expect(described_class.fix_missing_dose("CETIRIZINE Spirig HC cpr pellic 30 pce", sub, comp, "62568007"))
+        .to eq "CETIRIZINE Spirig HC cpr pellic 10 mg 30 pce"
+      expect(described_class.fix_missing_dose("CETIRIZINA Spirig HC cpr riv 30 pz", sub, comp, "62568007"))
+        .to eq "CETIRIZINA Spirig HC cpr riv 10 mg 30 pz"
+    end
+
+    it "is a no-op for non-catalogued registrations (avoids the IMPORTAL powder misfire)" do
+      expect(described_class.fix_missing_dose("IMPORTAL Pulver Btl 50 Stk", "lactitolum", "lactitolum monohydricum 10 g", "43414001"))
+        .to eq "IMPORTAL Pulver Btl 50 Stk"
+    end
+
+    it "is a no-op when a strength is already present" do
+      input = "CETIRIZIN Spirig HC Filmtabl 10 mg 30 Stk"
+      expect(described_class.fix_missing_dose(input, sub, comp, "62568007")).to eq input
+    end
+  end
+
+  describe ".fix_missing_volume (issue #112 #7)" do
+    let(:comp) { "tirzepatidum 7.5 mg, ... ad solutionem pro 0.6 ml corresp. natrium 0.6 mg." }
+
+    it "appends the per-pen volume for the catalogued IKSNR (MOUNJARO, 69696)" do
+      expect(described_class.fix_missing_volume("MOUNJARO KwikPen Inj Lös 7.5 mg 1 Stk", comp, "69696003"))
+        .to eq "MOUNJARO KwikPen Inj Lös 7.5 mg/0.6 ml 1 Stk"
+    end
+
+    it "is a no-op for non-catalogued registrations (avoids the CIMZIA concentration misfire)" do
+      input = "CIMZIA AutoClicks 200 mg/ml Fertpen 2 Stk"
+      expect(described_class.fix_missing_volume(input, "... pro 1 ml ...", "58277001")).to eq input
+    end
+
+    it "never double-appends a volume that is already present" do
+      input = "MOUNJARO KwikPen Inj Lös 7.5 mg/0.6 ml 1 Stk"
+      expect(described_class.fix_missing_volume(input, comp, "69696003")).to eq input
+    end
+  end
+
+  describe ".fix_truncated_metoject (issue #112 #1)" do
+    it "rebuilds the DE name from the prefix plus the Swissmedic size" do
+      expect(described_class.fix_truncated_metoject("METOJECT Autoinjektor 10 mg/0.2 ml Inj Lös 10 mg 1", "65672106", "1"))
+        .to eq "METOJECT Autoinjektor 10 mg/0.2 ml Fertpen 1 Stk"
+    end
+
+    it "localises French (stylo pré/pce) and Italian (penna preriempita/pz)" do
+      expect(described_class.fix_truncated_metoject("METOJECT Autoinjektor 10 mg/0.2 ml inj sol 10 mg 1", "65672106", "1"))
+        .to eq "METOJECT Autoinjektor 10 mg/0.2 ml stylo pré 1 pce"
+      expect(described_class.fix_truncated_metoject("METOJECT Autoinjektor 10 mg/0.2 ml sol inj 10 mg 1", "65672106", "1"))
+        .to eq "METOJECT Autoinjektor 10 mg/0.2 ml penna preriempita 1 pz"
+    end
+
+    it "uses the Swissmedic size even when the truncated count was cut off" do
+      expect(described_class.fix_truncated_metoject("METOJECT Autoinjektor 12.5 mg/0.25 ml Inj Lös 12.5", "65672111", "12"))
+        .to eq "METOJECT Autoinjektor 12.5 mg/0.25 ml Fertpen 12 Stk"
+    end
+
+    it "is a no-op for other registrations and without a size" do
+      other = "FOO Autoinjektor 10 mg/0.2 ml Inj Lös 10 mg 1"
+      expect(described_class.fix_truncated_metoject(other, "99999001", "1")).to eq other
+      keep = "METOJECT Autoinjektor 10 mg/0.2 ml Inj Lös 10 mg 1"
+      expect(described_class.fix_truncated_metoject(keep, "65672106", nil)).to eq keep
+    end
+  end
+
+  describe ".fix_truncated_volume_unit (issue #112 #3)" do
+    it "restores the truncated 'ml' for the VERACTIV Vitamin D3 registration" do
+      expect(described_class.fix_truncated_volume_unit("VERACTIV Vitamin D3 Wild Huile Trp 20'000 U.I. 10m", "57690004"))
+        .to eq "VERACTIV Vitamin D3 Wild Huile Trp 20'000 U.I. 10ml"
+    end
+
+    it "is a no-op when the volume already ends in 'ml'" do
+      input = "VERACTIV Vitamin D3 Wild Huile Trp 20'000 U.I. 10ml"
+      expect(described_class.fix_truncated_volume_unit(input, "57690004")).to eq input
+    end
+
+    it "is a no-op for other registrations" do
+      input = "FOO Tropfen 10m"
+      expect(described_class.fix_truncated_volume_unit(input, "12345001")).to eq input
+    end
+  end
 end
 
 describe Oddb2xml::Builder do
@@ -199,5 +335,53 @@ describe Oddb2xml::Builder do
       expect(item[:desc_fr]).to eq "RINVOQ comprimé à libération prolong. 30 mg 28 pce"
       expect(item[:desc_it]).to eq "RINVOQ compresse a rilascio prolungato 30 mg 28 pz"
     end
+
+    it "reconstructs missing dose info from Swissmedic for catalogued articles (issue #112 #4/#6/#7)" do
+      builder.packs = {
+        "65280001" => {substance_swissmedic: "atovaquonum, proguanili hydrochloridum",
+                       composition_swissmedic: "atovaquonum 250 mg, proguanili hydrochloridum 100 mg, cellulosum"},
+        "62568007" => {substance_swissmedic: "cetirizini dihydrochloridum",
+                       composition_swissmedic: "cetirizini dihydrochloridum 10 mg, lactosum monohydricum 65 mg"},
+        "69696003" => {substance_swissmedic: "tirzepatidum",
+                       composition_swissmedic: "tirzepatidum 7.5 mg, ad solutionem pro 0.6 ml corresp. natrium"}
+      }
+      builder.refdata = {
+        "7680652800017" => {ean13: "7680652800017", no8: "65280001",
+                            desc_de: "ATOVAQUON PLUS Spirig HC Filmtabl 250 mg 12 Stk", desc_fr: "", desc_it: ""},
+        "7680625680073" => {ean13: "7680625680073", no8: "62568007",
+                            desc_de: "CETIRIZIN Spirig HC Filmtabl 30 Stk", desc_fr: "", desc_it: ""},
+        "7680696960036" => {ean13: "7680696960036", no8: "69696003",
+                            desc_de: "MOUNJARO KwikPen Inj Lös 7.5 mg 1 Stk", desc_fr: "", desc_it: ""}
+      }
+
+      builder.apply_refdata_description_cleanups!
+
+      expect(builder.refdata["7680652800017"][:desc_de]).to eq "ATOVAQUON PLUS Spirig HC Filmtabl 250 mg / 100 mg 12 Stk"
+      expect(builder.refdata["7680625680073"][:desc_de]).to eq "CETIRIZIN Spirig HC Filmtabl 10 mg 30 Stk"
+      expect(builder.refdata["7680696960036"][:desc_de]).to eq "MOUNJARO KwikPen Inj Lös 7.5 mg/0.6 ml 1 Stk"
+    end
+
+    it "rebuilds truncated names from Swissmedic for catalogued articles (issue #112 #1/#3)" do
+      builder.packs = {
+        "65672106" => {substance_swissmedic: "methotrexatum", composition_swissmedic: "", size: "1"},
+        "57690004" => {substance_swissmedic: "colecalciferolum", composition_swissmedic: "", size: "1"}
+      }
+      builder.refdata = {
+        "7680656721066" => {ean13: "7680656721066", no8: "65672106",
+                            desc_de: "METOJECT Autoinjektor 10 mg/0.2 ml Inj Lös 10 mg 1",
+                            desc_fr: "METOJECT Autoinjektor 10 mg/0.2 ml inj sol 10 mg 1",
+                            desc_it: "METOJECT Autoinjektor 10 mg/0.2 ml sol inj 10 mg 1"},
+        "7680576900046" => {ean13: "7680576900046", no8: "57690004",
+                            desc_de: "VERACTIV Vitamin D3 Wild Huile Trp 20'000 U.I. 10m", desc_fr: "", desc_it: ""}
+      }
+
+      builder.apply_refdata_description_cleanups!
+
+      met = builder.refdata["7680656721066"]
+      expect(met[:desc_de]).to eq "METOJECT Autoinjektor 10 mg/0.2 ml Fertpen 1 Stk"
+      expect(met[:desc_fr]).to eq "METOJECT Autoinjektor 10 mg/0.2 ml stylo pré 1 pce"
+      expect(met[:desc_it]).to eq "METOJECT Autoinjektor 10 mg/0.2 ml penna preriempita 1 pz"
+      expect(builder.refdata["7680576900046"][:desc_de]).to eq "VERACTIV Vitamin D3 Wild Huile Trp 20'000 U.I. 10ml"
+    end
   end
 end

metadata

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