oddb2xml 2.2.9 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4d3a7108297dee9fb8d8070efa75d40f3d8a56
-  data.tar.gz: 3930fd61351c96d10432261df2c38d5026e01ba0
+  metadata.gz: 1ab40ef8c4f53f94608a1e9fc3b0b7a374ef5792
+  data.tar.gz: 6d9f87677f27a84001f543383a39a1eff8d67590
 SHA512:
-  metadata.gz: ee32efa8ea3a40d8db306d143886ac6b47a3d52d981755a5d11b4bb8afa2d01b24fb699db72ae5050b6b2cad3ffbd6e285646dad71e2d5b810d1d2cd514a4b3d
-  data.tar.gz: a273149b0c1b926a26e599da00f081e91e1291e40e5ae6ecd981d1e9be1fc78b2756021ac772c68332d5d152ca49ec67e9df799c74eb910ceed44db034d62402
+  metadata.gz: 626a02b6dab71eda2290cd3dc8197f622e5cd6ad1884e113b4f4aa0bb252f3e480bc20b9cb9be6dd202b7dff0313aaf7e68171e359c91279572b531dd31b36ce
+  data.tar.gz: 0239307754df9f22d634e814da89bfe8430c6aa14b33774c0cbeaa61f2f09e2469b2999cf8e19e3722f39ec8ab3e40fad8ee0e8ca0534d8492cc6ce19a3db000

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.2.9)
+    oddb2xml (2.3.0)
       archive-tar-minitar
       httpi (>= 2.4.1)
       mechanize
@@ -51,12 +51,12 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.8.2)
     mime-types (2.99)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     multi_json (1.11.2)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
     ntlm-http (0.1.1)
     parslet (1.7.1)
@@ -105,8 +105,8 @@ GEM
       wasabi (~> 3.4)
     sax-machine (1.3.2)
     slop (3.6.0)
-    spreadsheet (1.0.9)
-      ruby-ole (>= 1.0)
+    spreadsheet (1.1.1)
+      ruby-ole (~> 1.0)
     timecop (0.8.0)
     unf (0.1.4)
       unf_ext
@@ -138,4 +138,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.3.0 /15.12.2015
+
+* emit correct NBR_RECORD in oddb*.xml
+
 === 2.2.9 / 1.12.2015
 
 * Added value 'C' (Co-marketing) for GENCD from BAG Preparations.xml

data/lib/oddb2xml/builder.rb

@@ -273,18 +273,20 @@ module Oddb2xml
         ) {
           Oddb2xml.log "build_substance #{@substances.size} substances"
         exit 2 if @options[:extended] and @substances.size == 0
+        nbr_records = 0
         @substances.each_with_index do |sub_name, i|
-            xml.SB('DT' => '') {
+            xml.SB('DT' => '') do
               xml.SUBNO((i + 1).to_i)
               #xml.NAMD
               #xml.ANAMD
               #xml.NAMF
               xml.NAML sub_name
-            }
+              nbr_records += 1
+            end
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @substances.length.to_s
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -299,6 +301,7 @@ module Oddb2xml
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
         xml.LIMITATION(XML_OPTIONS) {
+        nbr_records = 0
         @limitations.each do |lim|
             xml.LIM('DT' => '') {
               case lim[:key]
@@ -320,11 +323,13 @@ module Oddb2xml
               if lim[:del]
                 xml.DEL 3
               end
+              nbr_records += 1
+
             }
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @limitations.length.to_s
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -335,6 +340,7 @@ module Oddb2xml
     def build_interaction
       prepare_interactions
       prepare_codes
+      nbr_records = 0
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -378,11 +384,12 @@ module Oddb2xml
               #  xml.TXTD
               #  xml.TXTF
               #}
+              nbr_records += 1
             }
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @interactions.length.to_s
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -392,6 +399,7 @@ module Oddb2xml
     end
     def build_code
       prepare_codes
+      nbr_records = 0
       Oddb2xml.log "build_code #{@codes.size} codes"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
@@ -408,11 +416,12 @@ module Oddb2xml
               #xml.DSCRD
               #xml.DSCRF
               xml.DEL     false
+              nbr_records += 1
             }
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @codes.keys.length
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -451,6 +460,7 @@ module Oddb2xml
       prepare_interactions
       prepare_codes
       add_missing_products_from_swissmedic
+      nbr_records = 0
       Oddb2xml.log "build_product #{@products.size+@missing.size} products"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
@@ -491,7 +501,7 @@ module Oddb2xml
             next if /^Q/i.match(obj[:atc])
             seq = obj[:seq]
             length += 1
-              xml.PRD('DT' => obj[:last_change]) {
+              xml.PRD('DT' => obj[:last_change]) do
               ean = obj[:ean]
               xml.GTIN ean
               ppac = ((_ppac = @packs[ean.to_s[4..11].intern] and !_ppac[:is_tier]) ? _ppac : {})
@@ -608,11 +618,12 @@ module Oddb2xml
               xml.EinheitSwissmedic   obj[:eht] unless obj[:eht].empty?
               xml.SubstanceSwissmedic obj[:sub] unless obj[:sub].empty?
               xml.CompositionSwissmedic obj[:comp] unless obj[:comp].empty?
-            }
+              nbr_records += 1
+            end
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD length.to_s
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -752,6 +763,7 @@ module Oddb2xml
       prepare_limitations
       prepare_articles
       idx = 0
+      nbr_records = 0
       Oddb2xml.log "build_article #{idx} of #{@articles.size} articles"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
@@ -784,7 +796,8 @@ module Oddb2xml
             if !@infos_zur_rose.empty? && ean && @infos_zur_rose[ean]
               info_zur_rose = @infos_zur_rose[ean] # zurrose
             end
-            xml.ART('DT' => obj[:last_change] ? obj[:last_change] : '') {
+            xml.ART('DT' => obj[:last_change] ? obj[:last_change] : '') do
+              nbr_records += 1
               xml.REF_DATA (obj[:refdata] || @migel[pharma_code]) ? '1' : '0'
               xml.PHAR  sprintf('%07d', obj[:pharmacode]) if obj[:pharmacode]
               #xml.GRPCD
@@ -948,11 +961,11 @@ module Oddb2xml
                   xml.NINCD nincd
                 }
               end
-            }
+            end
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @articles.length.to_s
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -962,6 +975,7 @@ module Oddb2xml
       Oddb2xml.add_hash(_builder.to_xml)
     end
     def build_fi
+      nbr_records = 0
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -985,12 +999,13 @@ module Oddb2xml
                 xml.monid     info[:monid]                    unless info[:monid].empty?
                 xml.style { xml.cdata(info[:style]) } if info[:style]
                 xml.paragraph { xml.cdata(Nokogiri::HTML.fragment(info[:paragraph].to_html).to_html(:encoding => 'UTF-8')) } if info[:paragraph]
+                nbr_records += 1
               }
             end
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD length
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -1000,6 +1015,7 @@ module Oddb2xml
     end
     def build_fi_product
       prepare_products
+      nbr_records = 0
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -1027,13 +1043,14 @@ module Oddb2xml
                                           xml.PRDNO seq[:product_key] unless seq[:product_key].empty?
                                           # as orphan ?
                                           xml.DEL   @orphan.include?(number) ? true : false
+                                          nbr_records += 1
                                         }
                   }
               end
             end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD length
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -1042,6 +1059,7 @@ module Oddb2xml
       Oddb2xml.add_hash(_builder.to_xml)
     end
     def build_company
+      nbr_records = 0
       Oddb2xml.log "build_company #{@companies.size} companies"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
@@ -1060,11 +1078,12 @@ module Oddb2xml
               xml.Land               c[:country]       unless c[:country].empty?
               xml.Betriebstyp        c[:type]          unless c[:type].empty?
               xml.BTM_Berechtigung   c[:authorization] unless c[:authorization].empty?
+              nbr_records += 1
             }
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @companies.length
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -1073,6 +1092,7 @@ module Oddb2xml
       Oddb2xml.add_hash(_builder.to_xml)
     end
     def build_person
+      nbr_records = 0
       Oddb2xml.log "build_person #{@people.size} persons"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
@@ -1090,11 +1110,12 @@ module Oddb2xml
               xml.Bewilligung_Selbstdispensation p[:license] unless p[:license].empty?
               xml.Diplom             p[:certificate]   unless p[:certificate].empty?
               xml.BTM_Berechtigung   p[:authorization] unless p[:authorization].empty?
+              nbr_records += 1
             }
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @people.length
+            xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.2.9"
+  VERSION = "2.3.0"
 end

data/spec/builder_spec.rb

@@ -229,6 +229,14 @@ MEDIZINALPERSON_ELEMENT_TESTS = [
   ['Personen/Person/BTM_Berechtigung', 'BTM_Berechtigung'],
 ]
 
+def check_result(rexml, nbr_record)
+  expect(XPath.match(rexml, '//RESULT/NBR_RECORD').size).to eq 1
+  expect(XPath.match(rexml, '//RESULT/NBR_RECORD').first.text.to_i).to eq nbr_record
+  expect(XPath.match(rexml, '//RESULT/OK_ERROR').first.text).to eq 'OK'
+  expect(XPath.match(rexml, '//RESULT/ERROR_CODE').first.text).to eq nil
+  expect(XPath.match(rexml, '//RESULT/MESSAGE').first.text).to eq nil
+end
+
 def checkItemForRefdata(doc, pharmacode, isRefdata)
   article = XPath.match( doc, "//ART[PHAR=#{pharmacode.to_s}]").first
   name =     article.elements['DSCRD'].text
@@ -403,12 +411,13 @@ def checkArticleXml(checkERYTHROCIN = true)
   # TODO: desitin.elements['QTY'].text.should eq '250 mg'
 end
 
-def checkProductXml
+def checkProductXml(nbr_record = -1)
   product_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_product.xml'))
   expect(File.exists?(product_filename)).to eq true
 
   # check products
   doc = REXML::Document.new IO.read(product_filename)
+  check_result(doc, nbr_record)
 
   desitin = checkAndGetProductWithGTIN(doc, Oddb2xml::LEVETIRACETAM_GTIN)
   expect(desitin.elements['ATC'].text).to eq('N03AX14')
@@ -445,8 +454,12 @@ end
 describe Oddb2xml::Builder do
   NrExtendedArticles = 90
   NrSubstances = 14
+  NrLimitations = 5
+  NrInteractions = 5
+  NrCodes = 6
   NrProdno = 23
   NrPackages = 24
+  NrProducts = 19
   RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
   include ServerMockHelper
   def common_run_init
@@ -474,6 +487,10 @@ describe Oddb2xml::Builder do
       expect(File.exists?(oddb_article_xml)).to eq true
     end
 
+    it 'should have a correct NBR_RECORD in oddb_article.xml' do
+      check_result(@rexml, NrProducts)
+    end
+
     it 'oddb_article.xml should contain a SHA256' do
       expect(XPath.match(@rexml, "//ART" ).first.attributes['SHA256'].size).to eq 64
       expect(XPath.match(@rexml, "//ART" ).size).to eq XPath.match(@rexml, "//ART" ).size
@@ -547,6 +564,16 @@ describe Oddb2xml::Builder do
       Oddb2xml::Cli.new(options.opts).run
     end
 
+    it 'should have a correct NBR_RECORD in oddb_fi_product.xml' do
+      rexml = REXML::Document.new File.read('oddb_fi_product.xml')
+      check_result(rexml, 0)
+    end
+
+    it 'should have a correct NBR_RECORD in oddb_fi.xml' do
+      rexml = REXML::Document.new File.read('oddb_fi.xml')
+      check_result(rexml, 2)
+    end
+
     it 'should return produce a correct oddb_fi.xml' do
       expect(File.exists?(@oddb_fi_xml)).to eq true
       inhalt = IO.read(@oddb_fi_xml)
@@ -568,8 +595,9 @@ if RUN_ALL
 
     it 'should generate a valid oddb_product.xml' do
       expect(@res).to match(/products/) if @res
-      checkProductXml
+      checkProductXml(NrProducts)
     end
+
   end
 
   context 'when -f dat is given' do
@@ -646,7 +674,7 @@ if RUN_ALL
 
     it 'should generate a valid oddb_product.xml' do
       expect(@res).to match(/products/) if @res != nil
-      checkProductXml
+      checkProductXml(NrProducts)
     end
 
     it 'should contain the correct (increased) prices' do
@@ -679,22 +707,37 @@ if RUN_ALL
       check_elements(oddb_code_xml, CODE_ELEMENT_TESTS)
     end
 
+    it 'should have a correct NBR_RECORD in oddb_code.xml' do
+      rexml = REXML::Document.new File.read(oddb_code_xml)
+      check_result(rexml, NrCodes)
+    end
+
     context 'XSD interaction' do
       check_attributes(oddb_interaction_xml, INTERACTION_ATTRIBUTE_TESTS)
       check_elements(oddb_interaction_xml, INTERACTION_ELEMENT_TESTS)
     end
 
+    it 'should have a correct NBR_RECORD in oddb_interaction.xml' do
+      rexml = REXML::Document.new File.read(oddb_interaction_xml)
+      check_result(rexml, NrInteractions)
+    end
+
     context 'XSD substance' do
       check_attributes(oddb_substance_xml, SUBSTANCE_ATTRIBUTE_TESTS)
       check_elements(oddb_substance_xml, SUBSTANCE_ELEMENT_TESTS)
     end
 
+    it 'should have a correct NBR_RECORD in oddb_substance.xml' do
+      rexml = REXML::Document.new File.read('oddb_substance.xml')
+      check_result(rexml, NrSubstances)
+    end
+
     it 'should emit a correct oddb_article.xml' do
       checkArticleXml
     end
 
     it 'should produce a correct oddb_product.xml' do
-      checkProductXml
+      checkProductXml(NrProducts)
     end
 
     it 'should report correct output on stdout' do
@@ -761,13 +804,18 @@ if RUN_ALL
       expect(XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('0000000') }.size).to eq(1) # from refdata_pharma.xml
     end
 
+    it 'should have a correct NBR_RECORD in oddb_limitation.xml' do
+      rexml = REXML::Document.new File.read('oddb_limitation.xml')
+      check_result(rexml, NrLimitations)
+    end
+
     it 'should emit a correct oddb_limitation.xml' do
       # check limitations
       limitation_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_limitation.xml'))
       expect(File.exists?(limitation_filename)).to eq true
       doc = REXML::Document.new File.new(limitation_filename)
       limitations = XPath.match( doc, "//LIM" )
-      expect(limitations.size).to be >= 4
+      expect(limitations.size).to eql NrLimitations
       expect(XPath.match( doc, "//SwissmedicNo5" ).find_all{|x| x.text.match('28486') }.size).to eq(1)
       expect(XPath.match( doc, "//LIMNAMEBAG" ).find_all{|x| x.text.match('ZYVOXID') }.size).to eq(1)
       expect(XPath.match( doc, "//LIMNAMEBAG" ).find_all{|x| x.text.match('070240') }.size).to eq(1)
@@ -823,13 +871,13 @@ if RUN_ALL
     it 'should add 80 percent to zur_rose pubbprice' do
       expect(File.exists?(oddb_article_xml)).to eq true
       FileUtils.cp(oddb_article_xml, File.join(Oddb2xml::WorkDir, 'tst-e80.xml'))
-      checkProductXml
+      checkProductXml(NrProducts)
       checkArticleXml
       checkPrices(true)
     end
 
     it 'should generate a correct oddb_product.xml' do
-      checkProductXml
+      checkProductXml(NrProducts)
     end
 
     it 'should generate an article with the COOL (fridge) attribute' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.3.0
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip