oddb2xml 2.7.8 → 2.8.0

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,19 @@ module Oddb2xml
             end
           end
         end
+        @firstbase.each do |ean13, obj|
+          entry = {
+            ean13: obj[:gtin],
+            desc_de: obj[:trade_item_description_de],
+            desc_fr: obj[:trade_item_description_fr],
+            atc_code: "",
+            company_ean: obj[:gln],
+            firstbase: true
+          }
+          if @refdata[obj[:gtin]].nil?
+            @articles << entry
+          end
+        end
       end
       Oddb2xml.log("prepare_articles done. Added #{nr_added} prices. Total #{@articles.size}")
     end
@@ -378,7 +392,6 @@ module Oddb2xml
               xml.LIMNIV lim[:niv]
               xml.DSCRD lim[:desc_de]
               xml.DSCRF lim[:desc_fr]
-              xml.DSCRI lim[:desc_it]
               xml.VDAT lim[:vdate]
               nbr_records += 1
             end
@@ -536,7 +549,7 @@ module Oddb2xml
           if lang == :de
             name = refdata && refdata[:desc_de] ? refdata[:desc_de] : obj[:sequence_name]
           elsif lang == :fr
-            name =  refdata[:desc_fr] if refdata && refdata[:desc_fr]
+            name = refdata && refdata[:desc_fr] ? refdata[:desc_fr] : obj[:sequence_name]
           elsif lang == :it
             name =  refdata[:desc_it] if refdata && refdata[:desc_it]
           else
@@ -560,7 +573,7 @@ module Oddb2xml
           @missing.each do |obj|
             ean = obj[:ean13]
             next unless check_name(obj, :de)
-            # next unless check_name(obj, :fr)
+            next unless check_name(obj, :fr)
             next if /^Q/i.match?(obj[:atc])
             if obj[:prodno]
               next if emitted.index(obj[:prodno])
@@ -572,9 +585,6 @@ module Oddb2xml
               xml.PRODNO obj[:prodno] if obj[:prodno]
               xml.DSCRD check_name(obj, :de)
               xml.DSCRF check_name(obj, :fr) if check_name(obj, :fr)
-              binding.pry if  check_name(obj, :de) &&  check_name(obj, :de).eql?('Varilrix Trockensub c solv')
-
-              xml.DSCRI check_name(obj, :it) if check_name(obj, :it)
               xml.ATC obj[:atc_code] unless obj[:atc_code].empty?
               xml.IT obj[:ith_swissmedic] if obj[:ith_swissmedic]
               xml.CPT
@@ -584,6 +594,14 @@ module Oddb2xml
               xml.CompositionSwissmedic obj[:composition_swissmedic] if obj[:composition_swissmedic]
             }
           end
+          @firstbase.each do |ean13, obj|
+            xml.PRD("DT" => "") {
+              xml.GTIN obj[:gtin]
+              xml.CPT
+              xml.DSCRD obj[:trade_item_description_de]
+              xml.DSCRF obj[:trade_item_description_fr]
+            }
+          end
           @products.sort.to_h.each do |ean13, obj|
             next if /^Q/i.match?(obj[:atc])
             seq = obj[:seq]
@@ -598,7 +616,6 @@ module Oddb2xml
               xml.PRODNO ppac[:prodno] if ppac[:prodno] && !ppac[:prodno].empty?
               xml.DSCRD check_name(obj, :de)
               xml.DSCRF check_name(obj, :fr)
-              xml.DSCRI check_name(obj, :it)
               # xml.BNAMD
               # xml.BNAMF
               # xml.ADNAMD
@@ -952,10 +969,10 @@ module Oddb2xml
               end
               xml.DSCRD obj[:desc_de] if obj[:desc_de] && !obj[:desc_de].empty?
               xml.DSCRF obj[:desc_fr] if obj[:desc_fr] && !obj[:desc_fr].empty?
-              xml.DSCRI obj[:desc_it] if obj[:desc_it] && !obj[:desc_it].empty?
+              xml.DSCRF obj[:desc_de] if !obj[:desc_fr] || obj[:desc_fr].empty?
               xml.SORTD obj[:desc_de].upcase if obj[:desc_de] && !obj[:desc_de].empty?
               xml.SORTF obj[:desc_fr].upcase if obj[:desc_fr] && !obj[:desc_fr].empty?
-              xml.SORTI obj[:desc_it].upcase if obj[:desc_it] && !obj[:desc_it].empty?
+              xml.SORTF obj[:desc_de].upcase if !obj[:desc_fr] || obj[:desc_fr].empty?
               # xml.QTYUD
               # xml.QTYUF
               # xml.IMG
@@ -966,7 +983,6 @@ module Oddb2xml
               if obj[:seq]
                 xml.SYN1D obj[:seq][:name_de] unless obj[:seq][:name_de].empty?
                 xml.SYN1F obj[:seq][:name_fr] unless obj[:seq][:name_fr].empty?
-                xml.SYN1I obj[:seq][:name_it] unless obj[:seq][:name_it].empty?
               end
               if obj[:seq]
                 case obj[:seq][:deductible]
@@ -1520,21 +1536,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
@@ -1647,7 +1663,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
@@ -1752,7 +1768,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]
@@ -1761,10 +1776,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]
@@ -1779,6 +1795,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/parslet_compositions.rb

@@ -430,6 +430,7 @@ class ParseComposition
         ast = transf.apply(parser.parse(cleaned))
       end
     rescue Parslet::ParseFailed => error
+      @@error_handler.nrParsingErrors ||= 0
       @@error_handler.nrParsingErrors += 1
       puts "#{File.basename(__FILE__)}:#{__LINE__}: failed parsing ==>  #{cleaned} #{error}"
       return nil
@@ -495,6 +496,7 @@ class ParseGalenicForm
         ast = transf.apply(parser.parse(string))
       end
     rescue Parslet::ParseFailed => error
+      @@error_handler.nrParsingErrors ||= 0
       @@error_handler.nrParsingErrors += 1
       puts "#{File.basename(__FILE__)}:#{__LINE__}: failed parsing ==>  #{string} #{error}"
       return nil

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.7.8"
+  VERSION = "2.8.0"
 end

data/oddb2xml.xsd

@@ -48,7 +48,6 @@
       FIRST import all data from swissINDEX
       * DSCRD  German name
       * DSCRF  French name (Products/article only from ZurRose do not have a french name)
-      * DSCRI  Italian name (Products/article only from ZurRose do not have a french name)
       * GTIN
         GTIN may be  8, 12, 13 or 14 chars long (https://en.wikipedia.org/wiki/Global_Trade_Item_Number)
         The EAN-8 code is an eight-digit barcode used usually for very small articles, such as a battery for hearing aid, where fitting a larger code onto the item would be difficult
@@ -129,15 +128,6 @@
     </xs:simpleType>
   </xs:element>
 
-  <xs:element name="DSCRI">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:minLength value="3" />
-        <xs:maxLength value="120" />
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-
   <xs:element name="ART">
     <xs:complexType>
       <xs:sequence>
@@ -167,15 +157,12 @@
           <xs:element ref="ns1:BG"/>
         </xs:sequence>
         <xs:element ref="ns1:DSCRD"/>
-        <xs:element ref="ns1:DSCRF" minOccurs="0" />
-        <xs:element ref="ns1:DSCRI" minOccurs="0"/>
+        <xs:element ref="ns1:DSCRF"/>
         <xs:element ref="ns1:SORTD"/>
-        <xs:element ref="ns1:SORTF" minOccurs="0"/>
-        <xs:element ref="ns1:SORTI" minOccurs="0"/>
+        <xs:element ref="ns1:SORTF"/>
         <xs:sequence minOccurs="0">
           <xs:element ref="ns1:SYN1D"/>
           <xs:element ref="ns1:SYN1F"/>
-          <xs:element ref="ns1:SYN1I"/>
           <xs:element ref="ns1:SLOPLUS"/>
         </xs:sequence>
         <xs:element ref="ns1:ARTCOMP"/>
@@ -258,10 +245,8 @@
   </xs:element>
   <xs:element name="SORTD" type="xs:string"/>
   <xs:element name="SORTF" type="xs:string"/>
-  <xs:element name="SORTI" type="xs:string"/>
   <xs:element name="SYN1D" type="xs:string"/>
   <xs:element name="SYN1F" type="xs:string"/>
-  <xs:element name="SYN1I" type="xs:string"/>
   <xs:element name="SLOPLUS">
     <xs:simpleType>
       <xs:restriction base="xs:byte">
@@ -361,10 +346,8 @@
         <xs:element ref="ns1:QTYMD"/>
         <xs:element ref="ns1:DSCRDMD"/>
         <xs:element ref="ns1:DSCRFMD"/>
-        <xs:element ref="ns1:DSCRIMD"/>
         <xs:element ref="ns1:SORTDMD"/>
         <xs:element ref="ns1:SORTFMD"/>
-        <xs:element ref="ns1:SORTIMD"/>
         <xs:sequence minOccurs="0">
           <xs:element ref="ns1:SYN1DMD"/>
           <xs:element ref="ns1:SYN1FMD"/>
@@ -416,10 +399,8 @@
   </xs:element>
   <xs:element name="SORTDMD" type="xs:string"/>
   <xs:element name="SORTFMD" type="xs:string"/>
-  <xs:element name="SORTIMD" type="xs:string"/>
   <xs:element name="SYN1DMD" type="xs:string"/>
   <xs:element name="SYN1FMD" type="xs:string"/>
-  <xs:element name="SYN1IMD" type="xs:string"/>
   <xs:element name="SLOPLUSMD">
     <xs:simpleType>
       <xs:restriction base="xs:byte">
@@ -741,7 +722,6 @@
         <xs:element ref="ns1:LIMNIV"/>
         <xs:element name="DSCRD" type="xs:string"/>
         <xs:element name="DSCRF" type="xs:string"/>
-        <xs:element name="DSCRI" type="xs:string"/>
         <xs:element ref="ns1:VDAT"/>
       </xs:sequence>
       <xs:attribute name="DT" use="required"/>
@@ -800,7 +780,6 @@
         <xs:element ref="ns1:LIMNIVMD"/>
         <xs:element name="DSCRDMD" type="xs:string"/>
         <xs:element name="DSCRFMD" type="xs:string"/>
-        <xs:element name="DSCRIMD" type="xs:string"/>
         <xs:element ref="ns1:VDATMD"/>
       </xs:sequence>
       <xs:attribute name="DT" use="required"/>
@@ -865,8 +844,7 @@
         <xs:element minOccurs="0" ref="ns1:PRODNO"/>
         <xs:sequence minOccurs="0">
           <xs:element ref="ns1:DSCRD"/>
-          <xs:element ref="ns1:DSCRF" minOccurs="0"/>
-          <xs:element ref="ns1:DSCRI" minOccurs="0"/>
+          <xs:element ref="ns1:DSCRF"/>
         </xs:sequence>
         <xs:element minOccurs="0" ref="ns1:ADINFD"/>
         <xs:element minOccurs="0" ref="ns1:ADINFF"/>
@@ -942,7 +920,6 @@
         <xs:sequence minOccurs="0">
           <xs:element ref="ns1:DSCRDMD"/>
           <xs:element ref="ns1:DSCRFMD"/>
-          <xs:element ref="ns1:DSCRIMD"/>
         </xs:sequence>
         <xs:element minOccurs="0" ref="ns1:ADINFDMD"/>
         <xs:element minOccurs="0" ref="ns1:ADINFFMD"/>
@@ -1111,7 +1088,6 @@
   <xs:element name="ITMD" type="xs:string"/>
   <xs:element name="DSCRDMD" type="xs:string"/>
   <xs:element name="DSCRFMD" type="xs:string"/>
-  <xs:element name="DSCRIMD" type="xs:string"/>
   <xs:element name="VDATMD" type="xs:NMTOKEN"/>
   <xs:element name="RESULTMD">
     <xs:complexType>

data/spec/artikelstamm_spec.rb

@@ -11,7 +11,7 @@ describe Oddb2xml::Builder do
     expect(@inhalt).not_to be nil
     unless @inhalt.index(expected_value)
       puts expected_value
-      binding.pry # TODO: Must not be active in production!!
+      # binding.pry # TODO: Must not be active in production!!
     end
     expect(@inhalt.index(expected_value)).not_to be nil
   end
@@ -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/builder_spec.rb

@@ -35,7 +35,7 @@ ARTICLE_ZURROSE_ELEMENTS = [
   ["ARTICLE/ART/ARTINS/NINCD", "20"]
 ]
 
-ARTICLE_NAROPIN = %(    <REF_DATA>1</REF_DATA>
+ARTICLE_NAROPIN = %(<REF_DATA>1</REF_DATA>
     <SMCAT>B</SMCAT>
     <SMNO>54015011</SMNO>
     <PRODNO>5401501</PRODNO>
@@ -44,10 +44,8 @@ ARTICLE_NAROPIN = %(    <REF_DATA>1</REF_DATA>
     <BG>N</BG>
     <DSCRD>NAROPIN Inj Lös 0.2 % 10ml Duofit Amp 5 Stk</DSCRD>
     <DSCRF>NAROPIN sol inj 0.2 % 10ml amp duofit 5 pce</DSCRF>
-    <DSCRI>NAROPIN Inj Lös 0.2 % 10ml Duofit Amp 5 Stk</DSCRI>
     <SORTD>NAROPIN INJ LÖS 0.2 % 10ML DUOFIT AMP 5 STK</SORTD>
     <SORTF>NAROPIN SOL INJ 0.2 % 10ML AMP DUOFIT 5 PCE</SORTF>
-    <SORTI>NAROPIN INJ LÖS 0.2 % 10ML DUOFIT AMP 5 STK</SORTI>
     <ARTCOMP>
       <COMPNO>7601001402539</COMPNO>
     </ARTCOMP>
@@ -56,8 +54,7 @@ ARTICLE_NAROPIN = %(    <REF_DATA>1</REF_DATA>
       <BC>7680540150118</BC>
       <BCSTAT>A</BCSTAT>
     </ARTBAR>
-  </ART>
-)
+  </ART>)
 
 ARTICLE_COMMON_ELEMENTS = [
   ["ARTICLE/ART/REF_DATA", "1"],
@@ -571,10 +568,11 @@ describe Oddb2xml::Builder do
 
     it "should generate ATC for 7680002770014" do
       oddb_product_xml = IO.read(File.join(Oddb2xml::WORK_DIR, "oddb_product.xml"))
-      text = %(<GTIN>7680002770021</GTIN>
+      text = %(<GTIN>7680002770014</GTIN>
     <PRODNO>0027701</PRODNO>
-    <DSCRD>Coeur-Vaisseaux Sérocytol, suppositoire</DSCRD>
-    <ATC>J06AA</ATC>
+    <DSCRD>SEROCYTOL Herz-Gefässe Supp 3 Stk</DSCRD>
+    <DSCRF>SEROCYTOL Coeur-Vaisseaux supp 3 pce</DSCRF>
+    <ATC>J06AA99</ATC>
     <IT>08.07.</IT>
     <CPT/>)
       expect(oddb_product_xml.index(text)).to be >= 1
@@ -585,6 +583,7 @@ describe Oddb2xml::Builder do
       text2 = %( <GTIN>7680002770021</GTIN>
     <PRODNO>0027701</PRODNO>
     <DSCRD>Coeur-Vaisseaux Sérocytol, suppositoire</DSCRD>
+    <DSCRF>Coeur-Vaisseaux Sérocytol, suppositoire</DSCRF>
     <ATC>J06AA</ATC>
     <IT>08.07.</IT>
     <CPT/>)