oddb2xml 2.7.8 → 2.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23dea260483ed3a99e62764331bf43924c5f095855e06c13b76d6d37e5f8d13a
-  data.tar.gz: ae24f986d8853676f62e41d2de071bece17540c5237d418ba14662708baf9057
+  metadata.gz: 3f177caa4764f9d7a9a9b165e936a9d2474fcab1f2f165ec757f9acad0c331eb
+  data.tar.gz: ca338ae5867dde260218865926b38eb7529d0dac9675aeff230f576ec7023cc0
 SHA512:
-  metadata.gz: c5b46f3ba07e2ee63e9021b0e7cef091f2c98daca82a724a15c3819ca9e91f6504a2ff0e61ba4bbd03621cd4fcffe95d4b1596af1354e841cb9c35de818ce8fd
-  data.tar.gz: b76c38273ec98bae15054df8b685025a569c947d16e487daf6d393efeca0592cc506b24618776db7ee7a5b09f4d3bccc47db3ef576da446470b02d996838fee8
+  metadata.gz: 793bc30149238fdfb22dc990fee57dc6913d3fa825fa2647ebcd0aee82264287f006765d082256c02215d37337efd8218ebaf9fed8297d5beb0f94d7ffb7ff2d
+  data.tar.gz: 230acb26a3931afa47be553a740095d2b5d352143d3304985eb4b80f532bc254c225f535ca575be2219ffa15193cdb09cf7bb2ad3d5311d9957dbf056f20c7ae

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.7.9 / 19.09.22
+* Remove newly generated DSCRI when not running --artikelstamm and 
+  generate always (as before 2.7.8) a DSCRF fiele
+
 === 2.7.8 / 14.09.22
 * Add fields for french and italian in artikelstamm whenever possible
 

data/lib/oddb2xml/builder.rb

@@ -378,7 +378,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 +535,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 +559,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 +571,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
@@ -598,7 +594,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 +947,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 +961,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]

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.7.9"
 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/shell.nix

@@ -4,9 +4,9 @@ with import <nixpkgs> {};
 stdenv.mkDerivation {
   name = "env";
   buildInputs = [
-    ruby_3_0
+    ruby_3_1
     rubyPackages_3_0.safe_yaml
-    ruby_3_0.devEnv
+    ruby_3_1.devEnv
     git
     python
     libpcap

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

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/>)

metadata

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