oddb2xml 2.5.7 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca220296af283c4de0922213c3be785a7cc8f2c
-  data.tar.gz: 9c8be6ecf7b70e07387c1a6252cebf3bea4e243f
+  metadata.gz: 366f44dde83e17df28bf8f833ab7a41abea0c018
+  data.tar.gz: 9e97aaefb44149756996f4ce4c8220d0679f876f
 SHA512:
-  metadata.gz: ce8ed5a537cb1f0ededcddfac17ceac36276d165ad0524854756f7fafed1c64bb3f3b09f048849319ed573617f42ff6569c522aa93dbdee4ca969b0e5cf14d74
-  data.tar.gz: c86602624445ed966d3c166e0e520c95d338eed4ac0c9cf91df1498181093d5ff96de8768d25f9bcbd99cdad1b8386c217e5778720fc186d031664b1db24c860
+  metadata.gz: 381616e0bc2e029a1013b6763dfb8bf9ee9d4900d09e5fa0015d519ac36306895b69f16e9e67152e23d5cc4140b8510148fa85706a63e2d2c8e52bc16df39c18
+  data.tar.gz: bb9bc23c545dbdd00f3c8e9e71cfa8c98d4002c44ed9db81cc42b7a2f59559c4049c68085ca029af9c786c3bf9d39fc55dc47beb0e761ab4497efd0d5fb50ce7

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.5.8 / 20.09.2018
+
+* Set SALECD to 'A' if article is from refdata_pharma/swissmedic
+  Marking these cases in oddb_article.xml, eg.
+  <SALECD>A<!--Overriding status I nincd 10 for 7680669940041 as in refdata_pharma--></SALECD>
+
 === 2.5.7 / 11.09.2018
 
 * Emit ATC code if product is not in refdata

data/lib/oddb2xml/builder.rb

@@ -828,6 +828,7 @@ module Oddb2xml
     end
 
     def build_article
+      @overriden_salecd = []
       prepare_limitations
       prepare_articles
       idx = 0
@@ -1035,7 +1036,7 @@ module Oddb2xml
           }
         }
       end
-      Oddb2xml.log "build_article. Done #{idx} of #{@articles.size} articles"
+      Oddb2xml.log "build_article. Done #{idx} of #{@articles.size} articles. Overrode #{@overriden_salecd.size} SALECD"
       Oddb2xml.add_hash(_builder.to_xml)
     end
     def build_fi
@@ -1381,8 +1382,16 @@ module Oddb2xml
         zur_rose = @infos_zur_rose[ean13] # zurrose
       end
       nincd = detect_nincd(obj)
+      in_refdata = !!( obj[:seq] && obj[:seq][:packages] && obj[:seq][:packages][ean13] && obj[:seq][:packages][ean13][:swissmedic_number8])
       status = (nincd && nincd == 13) ?  'A' : (zur_rose && zur_rose[:cmut] != '3') ? 'A' : 'I'
-      xml.SALECD(status) { xml.comment( "expiry_date #{obj[:expiry_date]}") if obj[:expiry_date] }
+      if in_refdata && !'A'.eql?(status)
+        msg = "Overriding status #{status} nincd #{nincd} for #{ean13} as in refdata_pharma"
+        # Oddb2xml.log msg
+        @overriden_salecd << ean13
+        xml.SALECD('A') { xml.comment(msg)}
+      else
+        xml.SALECD(status) { xml.comment( "expiry_date #{obj[:expiry_date]}") if obj[:expiry_date] }
+      end
     end
 
     def build_artikelstamm

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.5.7"
+  VERSION = "2.5.8"
 end

data/spec/artikelstamm_spec.rb

@@ -121,7 +121,7 @@ describe Oddb2xml::Builder do
     it 'should find price from Preparations.xml by setting' do
       expect(File.exists?(@elexis_v5_csv)).to eq true
       inhalt = File.open(@elexis_v5_csv, 'r+').read
-      expected = %(7680658560014,"Dibase 10'000, Tropfen 10000 IE/ml",Flasche(n),Flasche(n),5,9.25,6585601,A11CC05,cholecalciferolum,,07.02.3.,SL)
+      expected = %(7680658560014,Dibase 10'000 Tropfen 10000 IE/ml Fl 10 ml,,Flasche(n),5,9.25,,,,"",,SL)
       expect(inhalt.index(expected)).to be > 0
     end
 
@@ -214,25 +214,22 @@ describe Oddb2xml::Builder do
     
     it 'should contain DIBASE with phar' do
       expected = %(<ITEM PHARMATYPE="P">
-            <GTIN>7680658560014</GTIN>
+            <GTIN>7680658570013</GTIN>
             <!--override  with-->
             <SALECD>A</SALECD>
-            <DSCR>Dibase 10'000, Tropfen 10000 IE/ml</DSCR>
-            <DSCRF>Dibase 10'000, gouttes 10000 UI/ml</DSCRF>
+            <DSCR>DIBASE 25'000, Lösung zum Einnehmen</DSCR>
+            <DSCRF>--missing--</DSCRF>
             <COMP>
                 <NAME>Gebro Pharma AG</NAME>
                 <GLN/>
             </COMP>
-            <PEXF>5</PEXF>
-            <PPUB>9.25</PPUB>
             <PKG_SIZE>1</PKG_SIZE>
             <MEASURE>Flasche(n)</MEASURE>
             <MEASUREF>Flasche(n)</MEASUREF>
-            <DOSAGE_FORM>orale Tropflösung</DOSAGE_FORM>
-            <SL_ENTRY>true</SL_ENTRY>
+            <DOSAGE_FORM>Lösung</DOSAGE_FORM>
+            <DOSAGE_FORMF>Solution</DOSAGE_FORMF>
             <IKSCAT>D</IKSCAT>
-            <DEDUCTIBLE>10</DEDUCTIBLE>
-            <PRODNO>6585601</PRODNO>
+            <PRODNO>6585701</PRODNO>
         </ITEM>)
       expect(@inhalt.index(expected)).not_to be nil
     end

data/spec/builder_spec.rb

@@ -473,7 +473,7 @@ def checkProductXml(nbr_record = -1)
 end
 
 describe Oddb2xml::Builder do
-  NrExtendedArticles = 77
+  NrExtendedArticles = 76
   NrSubstances = 27
   NrLimitations = 14
   
@@ -605,6 +605,11 @@ describe Oddb2xml::Builder do
     <CPT/>)
       expect(oddb_product_xml.index(text2)).to be >= 1
     end
+    
+    it 'should generate SALECD A for swissmedic packages' do
+      expect(IO.read(oddb_article_xml).index('<SALECD>A<!--Overriding status I nincd 10 for 7680658560014 as in refdata_pharma--></SALECD>')).to be >= 1
+    end
+    
   end
 
   context 'when -o for fachinfo is given' do

data/spec/data/refdata_Pharma.xml

@@ -35,6 +35,17 @@
         <AUTH_HOLDER_NAME>Shire Switzerland GmbH</AUTH_HOLDER_NAME>
         <AUTH_HOLDER_GLN>7601001395756</AUTH_HOLDER_GLN>
       </ITEM>
+      <ITEM DT="2018-09-20T00:00:00">
+        <ATYPE>PHARMA</ATYPE>
+        <GTIN>7680658560014</GTIN>
+        <PHAR>7199565</PHAR>
+        <SWMC_AUTHNR>65856001</SWMC_AUTHNR>
+        <NAME_DE>DIBASE Tropfen 10000 IE/ml Fl 10 ml</NAME_DE>
+        <NAME_FR>DIBASE gouttes 10000 UI/ml fl 10 ml</NAME_FR>
+        <ATC>A11CC05</ATC>
+        <AUTH_HOLDER_NAME>Gebro Pharma AG</AUTH_HOLDER_NAME>
+        <AUTH_HOLDER_GLN>7612053000000</AUTH_HOLDER_GLN>
+      </ITEM>
       <ITEM DT="2017-12-08T00:00:00">
         <ATYPE>PHARMA</ATYPE>
         <GTIN>7680555580054</GTIN>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.5.7
+  version: 2.5.8
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip