oddb2xml 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a23f65760db47f4653ff96f2943f0364a4dee1
-  data.tar.gz: 36e79aaf87df21115e89c3ba2de44c0a761c4cfc
+  metadata.gz: 29ab2dd3e034c77a8a14f037099a49e719458003
+  data.tar.gz: 90308c0322b82f6237cd3be9156b10d9940296de
 SHA512:
-  metadata.gz: 4ff309b8715951736506b8ffa5eb8aae6676fa30510cdc90393dd7fb7e3cca1114ab85b6aaa8f37e280e9f1d19c69d134f3f49f03bfa62d3fdfcdf3e3c8d4550
-  data.tar.gz: ac32285e7bb4fd698821c7fced89b93edcfc5c53d125070f7e1606bf9a85052166dc31018fbeb713c853a71a66fd4988811f9f15ac38b80965a7db26e2e94837
+  metadata.gz: d7a88dca646f60b07c249e6093c5398dd90cdf1b04499300c944fbe1fb2bd314290086f5a242fe388152becbe70e99285f6592c5a864330278b15733487886fc
+  data.tar.gz: 90ade83f9f451ee82810b6b781cf1d8cc52f2bc5c395f61f1b459cc707fdf1b5b7fa5720e560ec7928906edc4141a6d317b09628e553291a1caf34b502b4ec9e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.2.4)
+    oddb2xml (2.2.5)
       archive-tar-minitar
       httpi (>= 2.4.1)
       mechanize

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.2.5 / 09.09.2015
+
+* Added field GEN_PRODUCTION, INSULIN_CATEGORY and DRUG_INDEX
+* Removed downloads of old BM_update from ywesee, as we have a better info about the drugs now
+
 === 2.2.4 / 09.09.2015
 
 * Fixed unit tests error introduced by the new column order of Packungen.xlsx

data/README.md

@@ -284,7 +284,6 @@ We use the following files:
 * https://index.ws.e-mediat.net/Swissindex/NonPharma/ws_Pharma_V101.asmx
 * http://download.swissmedicinfo.ch/ (AipsDownload)
 * https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/LPPV.txt
-* https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/BM_Update.txt
 * https://raw.githubusercontent.com/epha/robot/master/data/manual/swissmedic/atc.csv
 
 ## Rules for matching GTIN (aka EAN13), product number and IKSNR

data/lib/oddb2xml/builder.rb

@@ -703,11 +703,12 @@ module Oddb2xml
             ean13 = (ean12 + Oddb2xml.calc_checksum(ean12))
             items[ean13] = info
             xml.ARTICLE {
-              xml.GTIN          ean13
-              xml.NAME          info.column_c
-              xml.PKG_SIZE      info.pkg_size
-              xml.SELLING_UNITS info.selling_units
-              xml.MEASURE       info.measure # Nur wenn Lösung wen Spalte M ml, Spritze
+              xml.GTIN              ean13
+              xml.NAME              info.column_c
+              xml.PKG_SIZE          info.pkg_size
+              xml.SELLING_UNITS     info.selling_units
+              xml.MEASURE           info.measure # Nur wenn Lösung wen Spalte M ml, Spritze
+
               if  info.galenic_form.is_a?(String)
                 xml.GALENIC_FORM  info.galenic_form
                 xml.GALENIC_GROUP "Unknown"
@@ -764,7 +765,6 @@ module Oddb2xml
             ean = obj[:ean]
             next if pack_info and /Tierarzneimittel/.match(pack_info[:list_code])
             next if obj[:desc_de] and /ad us vet/i.match(obj[:desc_de])
-
             pharma_code = obj[:pharmacode]
             ean = 0 if sprintf('%013d', ean).match(/^000000/)
             if obj[:seq]
@@ -787,7 +787,10 @@ module Oddb2xml
               #xml.CDS01
               #xml.CDS02
               if ppac
-                xml.SMCAT ppac[:swissmedic_category] unless ppac[:swissmedic_category].empty?
+                xml.SMCAT             ppac[:swissmedic_category] unless ppac[:swissmedic_category].empty?
+                xml.GEN_PRODUCTION    ppac[:gen_production] unless ppac[:gen_production].empty?
+                xml.INSULIN_CATEGORY  ppac[:insulin_category] unless ppac[:insulin_category].empty?
+                xml.DRUG_INDEX        ppac[:drug_index] unless ppac[:drug_index].empty?
               end
               if no8 and !no8.to_s.empty?
                 if ean and ean.to_s[0..3] == "7680"
@@ -817,7 +820,7 @@ module Oddb2xml
               end
               #xml.TEMP
               if ean
-                flag = @flags[ean.to_s]
+                flag = (ppac && !ppac[:drug_index].empty?) ? true : false
                 # as same flag
                 xml.CDBG(flag ? 'Y' : 'N')
                 xml.BG(flag ? 'Y' : 'N')
@@ -1180,6 +1183,9 @@ module Oddb2xml
           next if obj[:type] == :nonpharma
           row = ''
           pack_info = nil
+          if (x = @packs.find{|k,v| v[:ean].to_i == ean})
+            pack_info = x[1]
+          end
           # Oddb2tdat.parse
           pac,no8 = nil,nil
           if obj[:seq] and obj[:seq][:packages]
@@ -1191,7 +1197,6 @@ module Oddb2xml
             # :swissmedic_numbers
           if pac
             no8 = pac[:swissmedic_number8].intern
-            pack_info = @packs[no8.intern] if no8
           end
           if pac and pac[:prices] == nil and no8
             ppac = ((ppac = pack_info and ppac[:is_tier]) ? ppac : nil)
@@ -1236,8 +1241,7 @@ module Oddb2xml
                                           else
                                             '0'
                                           end
-          row << "%#{DAT_LEN[:CBGG]}s"  % if ((pac && pac[:narcosis_flag] == 'Y') or # BAGXml
-                                              (@flags[ean]))                   # ywesee BM_update
+          row << "%#{DAT_LEN[:CBGG]}s"  % if (pack_info && pack_info[:drug_index])
                                             '3'
                                           else
                                             '0'

data/lib/oddb2xml/cli.rb

@@ -24,7 +24,6 @@ module Oddb2xml
       # product
       @items = {} # Items from Preparations.xml in BAG, using GTINs as key
       @refdata_types = {} # Base index from refdata
-      @flags = {} # narcotics flag files repo
       @lppvs = {} # lppv.txt from files repo
       @infos = {} # [option] FI from SwissmedicInfo
       @packs = {} # [option] Packungen from Swissmedic for dat
@@ -63,7 +62,6 @@ module Oddb2xml
         end
         threads << download(:zurrose)
         threads << download(:package) # swissmedic
-        threads << download(:bm_update) # oddb2xml_files
         threads << download(:lppv) # oddb2xml_files
         threads << download(:bag) # bag.e-mediat
         types.each do |type|
@@ -228,17 +226,6 @@ module Oddb2xml
             @packs
           end
         end
-      when :bm_update
-        begin # instead of Thread.new do
-          downloader = BMUpdateDownloader.new
-          str = downloader.download
-          Oddb2xml.log("BMUpdateDownloader str #{str.size} bytes")
-          @mutex.synchronize do
-            @flags = BMUpdateExtractor.new(str).to_hash
-            Oddb2xml.log("BMUpdateExtractor added #{@flags.size} flags")
-            @flags
-          end
-        end
       when :lppv
         begin # instead of Thread.new do
           downloader = LppvDownloader.new

data/lib/oddb2xml/downloader.rb

@@ -133,13 +133,6 @@ module Oddb2xml
       download_as('epha_interactions.csv', 'r')
     end
   end
-  class BMUpdateDownloader < Downloader
-    include DownloadMethod
-    def download
-      @url ||= 'https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/BM_Update.txt'
-      download_as('oddb2xml_files_bm_update.txt', 'r')
-    end
-  end
   class LppvDownloader < Downloader
     include DownloadMethod
     def download

data/lib/oddb2xml/extractor.rb

@@ -28,9 +28,6 @@ module Oddb2xml
       @xml = xml
     end
   end
-  class BMUpdateExtractor < Extractor
-    include TxtExtractorMethods
-  end
   class LppvExtractor < Extractor
     include TxtExtractorMethods
   end
@@ -96,7 +93,6 @@ module Oddb2xml
             :ean                 => (ean) ? ean : '',
             :swissmedic_category => (cat = pac.SwissmedicCategory) ? cat : '',
             :swissmedic_number8  => (num = pac.SwissmedicNo8)      ? num.rjust(8, '0') : '',
-            :narcosis_flag       => (flg = pac.FlagNarcosis)       ? flg : '',
             :prices              => { :exf_price => exf, :pub_price => pub },
           }
           # related all limitations
@@ -294,6 +290,9 @@ module Oddb2xml
               :composition_swissmedic => row[comp] ? row[comp].value.to_s : '',
               :sequence_name        => row[seq_name] ? row[seq_name].value.to_s : '',
               :is_tier              => (row[list_code] == 'Tierarzneimittel' ? true : false),
+              :gen_production       => row[COLUMNS_JULY_2015.keys.index(:gen_production)].value.to_s,
+              :insulin_category     => row[COLUMNS_JULY_2015.keys.index(:insulin_category)].value.to_s,
+              :drug_index           => row[COLUMNS_JULY_2015.keys.index(:drug_index)].value.to_s,
             }
           end
         end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.2.4"
+  VERSION = "2.2.5"
 end

data/oddb2xml.xsd

@@ -109,6 +109,9 @@
         </xs:element>
         <xs:element ref="ns1:PHAR"/>
         <xs:element minOccurs="0" ref="ns1:SMCAT"/>
+        <xs:element minOccurs="0" name="GEN_PRODUCTION" type="xs:string" />
+        <xs:element minOccurs="0" name="INSULIN_CATEGORY" type="xs:string" />
+        <xs:element minOccurs="0" name="DRUG_INDEX" type="xs:string" />
         <xs:element minOccurs="0" ref="ns1:SMNO"/>
         <xs:element minOccurs="0" ref="ns1:PRODNO"/>
         <xs:element minOccurs="0" ref="ns1:VAT"/>

data/spec/builder_spec.rb

@@ -187,7 +187,7 @@ def checkProductXml
   desitin.elements['CompositionSwissmedic'].text.should eq 'levetiracetamum 250 mg, excipiens pro compressi obducti pro charta.'
 
   desitin.elements['CPT/CPTCMP/LINE'].text.should eq '0'
-  desitin.elements['CPT/CPTCMP/SUBNO'].text.should eq '8'
+  desitin.elements['CPT/CPTCMP/SUBNO'].text.should eq '9'
   desitin.elements['CPT/CPTCMP/QTY'].text.should eq '250'
   desitin.elements['CPT/CPTCMP/QTYU'].text.should eq 'mg'
 
@@ -210,8 +210,8 @@ end
 describe Oddb2xml::Builder do
   NrExtendedArticles = 86
   NrSubstances = 12
-  NrProdno = 19
-  NrPackages = 20
+  NrProdno = 21
+  NrPackages = 22
   RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
   include ServerMockHelper
   def common_run_init
@@ -229,23 +229,22 @@ describe Oddb2xml::Builder do
       common_run_init
       options = Oddb2xml::Options.new
       @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      # Oddb2xml::Cli.new(options.opts).run # to debug
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      @doc = Nokogiri::XML(File.open(@article_xml))
+      @rexml = REXML::Document.new File.read(@article_xml)
     end
 
     it 'should return produce a oddb_article.xml' do
-      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
       File.exists?(@article_xml).should eq true
     end
 
     it 'oddb_article.xml should contain a SHA256' do
-      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      content = IO.read(@article_xml)
-      doc = REXML::Document.new File.new(@article_xml)
-      expect( XPath.match( doc, "//ART").first.attributes['DT']).to match /\d{4}-\d{2}-\d{2}/
-      expect( XPath.match( doc, "//ART").first.attributes['SHA256'].size).to eq 64
+      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
     end
 
     it 'should be possible to verify the oddb_article.xml' do
-      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
       result = Oddb2xml.verify_sha256(@article_xml)
       expect(result)
     end
@@ -253,6 +252,30 @@ describe Oddb2xml::Builder do
     it 'should be possible to verify all xml files against our XSD' do
       check_validation_via_xsd
     end
+
+    it 'should have a correct insulin (gentechnik) for 7680532900196' do
+      expect(XPath.match( @rexml, "//ART/[BC='7680532900196']").size).to eq 1
+      expect(XPath.match( @rexml, "//ART//GEN_PRODUCTION").size).to eq 1
+      expect(XPath.match( @rexml, "//ART//GEN_PRODUCTION").first.text).to eq 'X'
+      expect(XPath.match( @rexml, "//ART//INSULIN_CATEGORY").size).to eq 1
+      expect(XPath.match( @rexml, "//ART//INSULIN_CATEGORY").first.text).to eq 'Insulinanalog: schnell wirkend'
+    end
+
+    it 'should have a correct drug information for 7680555610041' do
+      expect(XPath.match( @rexml, "//ART/[BC='7680555610041']").size).to eq 1
+      expect(XPath.match( @rexml, "//ART//DRUG_INDEX").size).to eq 1
+      expect(XPath.match( @rexml, "//ART//DRUG_INDEX").first.text).to eq 'd'
+      found = false
+      XPath.match( @rexml, "//ART//CDBG").each{
+        |flag|
+          if  flag.text.eql?('Y')
+            found = true
+            break
+          end
+      }
+      expect(found)
+    end
+
   end
 
   context 'when -o for fachinfo is given' do
@@ -296,6 +319,7 @@ if RUN_ALL
       options = Oddb2xml::Options.new
       options.parser.parse!('-f dat --log'.split(' '))
       @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      # Oddb2xml::Cli.new(options.opts).run # to debug
     end
 
     it 'should contain the correct values fo CMUT from zurrose_transfer.dat' do
@@ -307,6 +331,9 @@ if RUN_ALL
       oddb_dat.should match(/^..3/), "should have a record with '3' in CMUT field"
       oddb_dat.should match(RegExpDesitin), "should have Desitin"
       IO.readlines(dat_filename).each{ |line| check_article_IGM_format(line) }
+      m = /.+DIAPHIN Trocke.*7680555610041.+/.match(oddb_dat)
+      expect(m[0].size).to eq 97 # size of IGM 1 record
+      expect(m[0][74]).to eq '3'
     end
   end
 
@@ -340,7 +367,8 @@ if RUN_ALL
       common_run_init
       options = Oddb2xml::Options.new
       options.parser.parse!('--append -I 80 -e'.split(' '))
-      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      Oddb2xml::Cli.new(options.opts).run
+      # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
     end
 
     it "oddb_article with stuf from ZurRose", :skip => "ZurRose contains ERYTHROCIN i.v. Troc*esteekensub 1000 mg Amp [!]" do

data/spec/calc_spec.rb

@@ -8,7 +8,6 @@ require "#{Dir.pwd}/lib/oddb2xml/calc"
 include Oddb2xml
 
 describe Oddb2xml::Calc do
-  RunAllTests = true
   before(:all) do  VCR.eject_cassette; VCR.insert_cassette('oddb2xml') end
   after(:all) do   VCR.eject_cassette end
 
@@ -102,7 +101,7 @@ describe Oddb2xml::Calc do
                                   # :count => 10, :multi => 1,  :dose => ''
                                   }
                             )
-  tst_nutriflex = TestExample.new('Nutriflex Lipid plus ohne Elektrolyte, Infusionsemulsion 1250ml',
+  Tst_nutriflex = TestExample.new('Nutriflex Lipid plus ohne Elektrolyte, Infusionsemulsion 1250ml',
                                 56089, 1, 1, 'Nutriflex Lipid plus, Infusionsemulsion, 1250ml',
                                 '5 x 1250', 'ml',
                                 'glucosum anhydricum, isoleucinum, leucinum, lysinum anhydricum, methioninum, phenylalaninum, threoninum, tryptophanum, valinum, argininum, histidinum, alaninum, acidum asparticum, acidum glutamicum, glycinum, prolinum, serinum, aminoacida, carbohydrata, materia crassa, sojae oleum, triglycerida saturata media',
@@ -128,7 +127,7 @@ Corresp. 5300 kJ.",
                                   }
                               )
 
-  tst_naropin = TestExample.new('Das ist eine Injektionslösung von einer Packung mit 5 x 100 ml',
+  Tst_naropin = TestExample.new('Das ist eine Injektionslösung von einer Packung mit 5 x 100 ml',
                              54015, 01, 100, "Naropin 0,2 %, Infusionslösung / Injektionslösung",
                              '1 x 5 x 100', 'ml',
                              'ropivacainum',
@@ -139,7 +138,7 @@ Corresp. 5300 kJ.",
                                }
                             )
 
-if RunAllTests
+
   context 'should parse Solvens:' do
     text = 'Solvens: conserv.: alcohol benzylicus 18 mg, aqua ad iniectabilia q.s. ad solutionem pro 2 ml.'
     info = Calc.new('Solu-Cortef 100 mg, Injektions-/Infusionspräparat', nil, nil,
@@ -197,6 +196,7 @@ if RunAllTests
     specify { expect(result.selling_units).to eq 10 }
     specify { expect(result.measure).to eq 'ml' }
   end
+
   context 'should return correct value for Diamox, comprimés' do
     pkg_size_L = '1 x 25'
     einheit_M  = 'Tablette(n)'
@@ -254,7 +254,7 @@ if RunAllTests
   end
   [tst_fluorglukose,
    tst_kamillin,
-   tst_naropin,
+   Tst_naropin,
    tst_diamox,
    tst_mutagrip,
   ].each {
@@ -272,8 +272,8 @@ if RunAllTests
   }
 
   context 'find correct result for Injektionslösung' do
-    info = Calc.new(tst_naropin.name_C, tst_naropin.package_size_L, tst_naropin.einheit_M, tst_naropin.active_substance_0, tst_naropin.composition_P)
-    specify { expect(tst_naropin.url).to eq 'http://ch.oddb.org/de/gcc/drug/reg/54015/seq/01/pack/100' }
+    info = Calc.new(Tst_naropin.name_C, Tst_naropin.package_size_L, Tst_naropin.einheit_M, Tst_naropin.active_substance_0, Tst_naropin.composition_P)
+    specify { expect(Tst_naropin.url).to eq 'http://ch.oddb.org/de/gcc/drug/reg/54015/seq/01/pack/100' }
     specify { expect(info.galenic_form.description).to eq  'Infusionslösung/Injektionslösung' }
     specify { expect(info.galenic_group.description).to eq  'Injektion/Infusion' }
     specify { expect(info.pkg_size).to eq '1 x 5 x 100' }
@@ -290,103 +290,6 @@ if RunAllTests
     specify { expect(info.measure).to eq  'Kapsel(n)' }
   end
 
-  run_time_options = '--calc --skip-download'
-  context "when passing #{run_time_options}" do
-    let(:cli) do
-      options = Oddb2xml::Options.new
-      options.parser.parse!(run_time_options.split(' '))
-      Oddb2xml::Cli.new(options.opts)
-    end
-    it 'should create a correct xml and a csv file' do
-      src = File.expand_path(File.join(File.dirname(__FILE__), 'data', 'swissmedic_package-galenic.xlsx'))
-      dest =  File.join(Oddb2xml::WorkDir, 'swissmedic_package.xlsx')
-      FileUtils.makedirs(Oddb2xml::WorkDir)
-      cli.run
-      expected = [
-        'oddb_calc.xml',
-        'oddb_calc.csv',
-      ].each { |file|
-              full = File.join(Oddb2xml::WorkDir, file)
-              expect(File.exists?(full)).to eq true
-             }
-      xml_file_name = File.join(Oddb2xml::WorkDir, 'oddb_calc.xml')
-      xml = File.read(xml_file_name)
-      oddb_calc_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_calc.xsd'))
-      File.exists?(oddb_calc_xsd).should eq true
-      xsd = Nokogiri::XML::Schema(File.read(oddb_calc_xsd))
-      doc = Nokogiri::XML(File.read(xml_file_name))
-      xsd.validate(doc).each do |error|  expect(error).to be_nil end
-      doc = REXML::Document.new xml
-      gtin = '7680540151009'
-      ean12 = '7680' + sprintf('%05d',tst_naropin.iksnr_A) + sprintf('%03d',tst_naropin.pack_K)
-      ean13 = (ean12 + Oddb2xml.calc_checksum(ean12))
-      ean13.should eq gtin
-
-      tst_naropin.values_to_compare.each{
-        | key, value |
-          result = XPath.match( doc, "//ARTICLE[GTIN='#{gtin}']/#{key.to_s.upcase}").first.text
-          puts "Testing key #{key.inspect} #{value.inspect} against #{result} seems to fail" unless result == value.to_s
-          result.should eq value.to_s
-      }
-
-      gtin = '7680560890018'
-      ean12 = '7680' + sprintf('%05d',tst_nutriflex.iksnr_A) + sprintf('%03d',tst_nutriflex.pack_K)
-      ean13 = (ean12 + Oddb2xml.calc_checksum(ean12))
-      ean13.should eq gtin
-      tst_nutriflex.values_to_compare.each{
-        | key, value |
-          result = XPath.match( doc, "//ARTICLE[GTIN='#{gtin}']/#{key.to_s.upcase}").first.text
-          puts "Testing key #{key.inspect} #{value.inspect} against #{result} seems to fail" unless result == value.to_s
-          result.should eq value.to_s
-      }
-      matri_name = 'Matricariae Extractum Isopropanolicum Liquidum'
-      XPath.match( doc, "//ARTICLE[GTIN='7680002770014']/NAME").first.text.should eq "Coeur-Vaisseaux Sérocytol, suppositoire"
-      XPath.match( doc, "//ARTICLE[GTIN='7680545250363']").first.should eq nil
-#      XPath.match( doc, "//ARTICLE[GTIN='7680545250363']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME")
-#        find{|x| x.text.eql?("Alprostadilum")}.text.should eq 'Alprostadilum'
-      XPath.match( doc, "//ARTICLE[GTIN='7680458820202']/NAME").last.text.should eq 'Magnesiumchlorid 0,5 molar B. Braun, Zusatzampulle für Infusionslösungen'
-      XPath.match( doc, "//ARTICLE[GTIN='7680458820202']/GALENIC_FORM").last.text.should match /Ampulle/i
-      XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").first.text.should eq 'I'
-      XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL_DESCRIPTION").first.text.should eq 'Glucoselösung'
-      XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").each{ |x| puts x.text }
-      XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").last.text.should eq 'III'
-      XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/CORRESP").last.text.should eq '4240 kJ pro 1 l'
-
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME").
-        find{|x| x.text.eql?(matri_name)}.text.should eq matri_name
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/NAME").last.text.should eq 'Kamillin Medipharm, Bad'
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/GALENIC_FORM").last.text.should eq 'Bad'
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/QTY").first.text.should eq '98.9'
-      XPath.match( doc, "//ARTICLE[GTIN='7680300150105']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME").first.text.should eq 'Lidocaini Hydrochloridum'
-      XPath.match( doc, "//ARTICLE[GTIN='7680300150105']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/UNIT").first.text.should eq 'mg/ml'
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/SUBSTANCE_NAME").first.text.should eq 'Levomenolum'
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/MORE_INFO").first.text.should eq 'ratio: 1:2-2.8'
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/DOSE_TEXT").first.text.should eq '10-50 mg'
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/QTY").first.should eq nil
-      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/UNIT").first.should eq nil
-
-      XPath.match( doc, "//ARTICLE[GTIN='7680446250592']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SALTS/SALT/SUBSTANCE_NAME").first.text.should eq 'Ceftriaxonum Natricum'
-
-      XPath.match( doc, "//ARTICLE[GTIN='7680611860045']/NAME").first.text.should eq 'Nutriflex Omega special, Infusionsemulsion 2500 ml'
-      XPath.match( doc, "//ARTICLE[GTIN='7680611860045']/GALENIC_FORM").first.text.should eq 'Infusionsemulsion'
-      XPath.match( doc, "//ARTICLE[GTIN='7680611860045']/SELLING_UNITS").first.text.should eq '5'
-
-      XPath.match( doc, "//ARTICLE[GTIN='7680165980114']/COMPOSITIONS/COMPOSITION/EXCIPIENS/SUBSTANCE_NAME").first.text.should eq 'Excipiens ad solutionem'
-      XPath.match( doc, "//ARTICLE[GTIN='7680165980114']/COMPOSITIONS/COMPOSITION/EXCIPIENS/QTY").first.text.should eq '1'
-      XPath.match( doc, "//ARTICLE[GTIN='7680165980114']/COMPOSITIONS/COMPOSITION/EXCIPIENS/UNIT").first.text.should eq 'ml'
-      XPath.match( doc, "//ARTICLE[GTIN='7680165980114']/NAME").first.text.should eq 'W-Tropfen'
-      XPath.match( doc, "//ARTICLE[GTIN='7680165980114']/GALENIC_FORM").last.text.should eq 'Tropfen'
-
-      XPath.match( doc, "//ARTICLE[GTIN='7680589430011']/NAME").first.text.should eq 'Apligraf'
-      XPath.match( doc, "//ARTICLE[GTIN='7680589430011']/GALENIC_FORM").last.text.should eq 'Unbekannt' # TODO?? 'Scheibe(n)/disque(s)'
-
-      XPath.match( doc, "//ARTICLE[GTIN='7680556740075']/NAME").first.text.should eq "Caverject DC 20, Injektionspräparat"
-      XPath.match( doc, "//ARTICLE[GTIN='7680556740075']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE").size.should eq 6
-      XPath.match( doc, "//ARTICLE[GTIN='7680556740075']/COMPOSITIONS/COMPOSITION/EXCIPIENS/SUBSTANCE_NAME").first.text.should eq "pro Vitro"
-
-    end
-  end
-
   context 'find correct result for Kamillin' do
     info = Calc.new(tst_kamillin.name_C, tst_kamillin.package_size_L, tst_kamillin.einheit_M, tst_kamillin.active_substance_0, tst_kamillin.composition_P)
     specify { expect(info.selling_units).to eq  25 }
@@ -413,7 +316,7 @@ if RunAllTests
   end
 
   context 'find correct result for Nutriflex' do
-    info = Calc.new(tst_nutriflex.name_C, tst_nutriflex.package_size_L, tst_nutriflex.einheit_M, tst_nutriflex.active_substance_0, tst_nutriflex.composition_P)
+    info = Calc.new(Tst_nutriflex.name_C, Tst_nutriflex.package_size_L, Tst_nutriflex.einheit_M, Tst_nutriflex.active_substance_0, Tst_nutriflex.composition_P)
     specify { expect(info.selling_units).to eq  5 }
     specify { expect(info.galenic_form.description).to eq  "Infusionsemulsion" }
   end
@@ -706,4 +609,148 @@ Die HILFSSTOFFE sind Aqua ad iniectabilia und Natrii chloridum.
     end
   end
 end
+
+describe Oddb2xml::Calc do
+
+  before(:all) do
+    @savedDir = Dir.pwd
+    cleanup_directories_before_run
+    FileUtils.makedirs(Oddb2xml::WorkDir)
+    Dir.chdir Oddb2xml::WorkDir
+    VCR.eject_cassette; VCR.insert_cassette('oddb2xml')
+    @run_time_options = '--calc --skip-download'
+    @options = Oddb2xml::Options.new
+    @options.parser.parse!(@run_time_options.split(' '))
+    @oddb_calc_xml = File.join(Oddb2xml::WorkDir, 'oddb_calc.xml')
+    @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(@options.opts).run }
+    expect(File.exists?(@oddb_calc_xml)).to eq true
+    @doc = REXML::Document.new File.read(@oddb_calc_xml)
+  end
+
+  after(:all) do
+    Dir.chdir @savedDir if @savedDir and File.directory?(@savedDir)
+  end
+
+  context "when passing #{@run_time_options}" do
+    it 'should contain the new fields as per July 2015' do
+      #         xml.GEN_PRODUCTION    gen_production
+      #          xml.INSULIN_CATEGORY  insulin_category
+      #          xml.DRUG_INDEX        drug_index
+      expect(File.exists?(@oddb_calc_xml)).to eq true
+    end
+
+    it 'should create a correct xml and a csv file' do
+      src = File.expand_path(File.join(File.dirname(__FILE__), 'data', 'swissmedic_package-galenic.xlsx'))
+      dest =  File.join(Oddb2xml::WorkDir, 'swissmedic_package.xlsx')
+      expected = [
+        'oddb_calc.xml',
+        'oddb_calc.csv',
+      ].each { |file|
+              full = File.join(Oddb2xml::WorkDir, file)
+              expect(File.exists?(full)).to eq true
+             }
+      oddb_calc_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_calc.xsd'))
+      File.exists?(oddb_calc_xsd).should eq true
+      xsd = Nokogiri::XML::Schema(File.read(oddb_calc_xsd))
+      doc = Nokogiri::XML(File.read(@oddb_calc_xml))
+      xsd.validate(doc).each do |error|  expect(error).to be_nil end
+    end
+
+    it 'should create correct entries for narotin' do
+      gtin = '7680540151009'
+      ean12 = '7680' + sprintf('%05d',Tst_naropin.iksnr_A) + sprintf('%03d',Tst_naropin.pack_K)
+      ean13 = (ean12 + Oddb2xml.calc_checksum(ean12))
+      ean13.should eq gtin
+
+      Tst_naropin.values_to_compare.each{
+        | key, value |
+          result = XPath.match( @doc, "//ARTICLE[GTIN='#{gtin}']/#{key.to_s.upcase}").first.text
+          puts "Testing key #{key.inspect} #{value.inspect} against #{result} seems to fail" unless result == value.to_s
+          result.should eq value.to_s
+      }
+    end
+
+    it 'should create correct entries for narotin' do
+      gtin = '7680560890018'
+      ean12 = '7680' + sprintf('%05d',Tst_nutriflex.iksnr_A) + sprintf('%03d',Tst_nutriflex.pack_K)
+      ean13 = (ean12 + Oddb2xml.calc_checksum(ean12))
+      ean13.should eq gtin
+      Tst_nutriflex.values_to_compare.each{
+        | key, value |
+          result = XPath.match( @doc, "//ARTICLE[GTIN='#{gtin}']/#{key.to_s.upcase}").first.text
+          puts "Testing key #{key.inspect} #{value.inspect} against #{result} seems to fail" unless result == value.to_s
+          result.should eq value.to_s
+      }
+    end
+
+    it 'should create correct entries for 7680555940018' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").first.text.should eq 'I'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL_DESCRIPTION").first.text.should eq 'Glucoselösung'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").each{ |x| puts x.text }
+      XPath.match( @doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").last.text.should eq 'III'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/CORRESP").last.text.should eq '4240 kJ pro 1 l'
+    end
+
+    it 'should create correct entries for Lidocaini' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680300150105']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME").first.text.should eq 'Lidocaini Hydrochloridum'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680300150105']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/UNIT").first.text.should eq 'mg/ml'
+    end
+
+    it 'should create correct entries for Levomenolum' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/SUBSTANCE_NAME").first.text.should eq 'Levomenolum'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/MORE_INFO").first.text.should eq 'ratio: 1:2-2.8'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/DOSE_TEXT").first.text.should eq '10-50 mg'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/QTY").first.should eq nil
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/UNIT").first.should eq nil
+      matri_name = 'Matricariae Extractum Isopropanolicum Liquidum'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME").
+        find{|x| x.text.eql?(matri_name)}.text.should eq matri_name
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/NAME").last.text.should eq 'Kamillin Medipharm, Bad'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/GALENIC_FORM").last.text.should eq 'Bad'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/QTY").first.text.should eq '98.9'
+    end
+
+    it 'should create correct entries for Magnesiumchlorid' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680458820202']/NAME").last.text.should eq 'Magnesiumchlorid 0,5 molar B. Braun, Zusatzampulle für Infusionslösungen'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680458820202']/GALENIC_FORM").last.text.should match /Ampulle/i
+    end
+
+    it 'should create correct entries for W-Tropfen' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680165980114']/COMPOSITIONS/COMPOSITION/EXCIPIENS/SUBSTANCE_NAME").first.text.should eq 'Excipiens ad solutionem'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680165980114']/COMPOSITIONS/COMPOSITION/EXCIPIENS/QTY").first.text.should eq '1'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680165980114']/COMPOSITIONS/COMPOSITION/EXCIPIENS/UNIT").first.text.should eq 'ml'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680165980114']/NAME").first.text.should eq 'W-Tropfen'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680165980114']/GALENIC_FORM").last.text.should eq 'Tropfen'
+    end
+
+    it 'should create correct entries for Coeur-Vaisseaux Sérocytol' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680002770014']/NAME").first.text.should eq "Coeur-Vaisseaux Sérocytol, suppositoire"
+    end
+
+    it 'should not have Alprostadilum' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680545250363']").first.should eq nil
+    end
+
+    it 'should create correct entries for Ceftriaxonum' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680446250592']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SALTS/SALT/SUBSTANCE_NAME").first.text.should eq 'Ceftriaxonum Natricum'
+
+    end
+
+    it 'should create correct entries for Nutriflex' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680611860045']/NAME").first.text.should eq 'Nutriflex Omega special, Infusionsemulsion 2500 ml'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680611860045']/GALENIC_FORM").first.text.should eq 'Infusionsemulsion'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680611860045']/SELLING_UNITS").first.text.should eq '5'
+    end
+
+    it 'should create correct entries for Apligraf' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680589430011']/NAME").first.text.should eq 'Apligraf'
+      XPath.match( @doc, "//ARTICLE[GTIN='7680589430011']/GALENIC_FORM").last.text.should eq 'Unbekannt' # TODO?? 'Scheibe(n)/disque(s)'
+    end
+
+    it 'should create correct entries for Caverject' do
+      XPath.match( @doc, "//ARTICLE[GTIN='7680556740075']/NAME").first.text.should eq "Caverject DC 20, Injektionspräparat"
+      XPath.match( @doc, "//ARTICLE[GTIN='7680556740075']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE").size.should eq 6
+      XPath.match( @doc, "//ARTICLE[GTIN='7680556740075']/COMPOSITIONS/COMPOSITION/EXCIPIENS/SUBSTANCE_NAME").first.text.should eq "pro Vitro"
+    end
+  end
 end