oddb2xml 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3049b7997045bc7986340211b3611456ac10e68f
-  data.tar.gz: 11ade3b7d58f6b6de89f06ef51feaae35e69d2bb
+  metadata.gz: a4a25bdc724120b7570f7d671bcb4b5f7bfbc90d
+  data.tar.gz: 41ba2d28a669bc73e41d4767339d10eddc2d480a
 SHA512:
-  metadata.gz: e788309b1dc86015dabdf1a0f1ed6b3afd4322d38171c4ac9074657af65f73c2695ee0cd8e95b1aaaf3725e0095bc84df1d68d9eecad1842225c8bad79da679b
-  data.tar.gz: 901264169a14365065320c630886d631edad15adb8334708ad69073c01b599b470f85a1f849cef44dd6dbad23ceb710a03215f3809976d74e8c9558141e0ade6
+  metadata.gz: 129ce0e4983949fe59d1281643330a0c5d11d367adc2cb130aa85ca2f60c33b542b7311e92fbe821d42aa8a9c4a155520a919f77fb4d11fbe84bb6b220814c78
+  data.tar.gz: 8cf9e4fe4d4610df2794b4004abedeba5dd9ddce8c59aa99efc3ca0a8a40d63d2819a32fdaaa703ec473debdd6a0576125e7dd27ec9ac017d3937639e0ec676c

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.3.2 /11.01.2016
+
+* File from swissmedic for blood products and vaccines has no longer a field Kühlkette. Therefore no longer downloading it.
+* Set oddb_article COOL for all blod products and vaccines
+
 === 2.3.1 /15.12.2015
 
 * Deactivate (Pseudo-)Migel. Updated corresponding tests

data/lib/oddb2xml/builder.rb

@@ -35,7 +35,7 @@ module Oddb2xml
   }
   class Builder
     attr_accessor :subject, :refdata, :items, :flags, :lppvs,
-                  :actions, :migel, :orphan, :fridge,
+                  :actions, :migel, :orphan,
                   :infos, :packs, :infos_zur_rose,
                   :ean14, :tag_suffix,
                   :companies, :people,
@@ -53,7 +53,6 @@ module Oddb2xml
       @infos_zur_rose     = {} # zurrose
       @actions    = []
       @orphan    = []
-      @fridge    = []
       @ean14      = false
       @companies  = []
       @people     = []
@@ -831,10 +830,7 @@ module Oddb2xml
                 xml.LIMPTS pac[:limitation_points] unless pac[:limitation_points].empty?
               end
               #xml.GRDFR
-              if no8 and !no8.empty? and
-                  no8.to_s =~ /(\d{5})(\d{3})/
-                xml.COOL 1 if @fridge.include?($1.to_s)
-              end
+              xml.COOL 1 if ppac && /Blutprodukte|impfstoffe/.match(ppac[:list_code])
               #xml.TEMP
               if ean
                 flag = (ppac && !ppac[:drug_index].empty?) ? true : false
@@ -1260,8 +1256,7 @@ module Oddb2xml
                                           else
                                             '3'
                                           end
-          row << "%#{DAT_LEN[:CLAG]}s"  % if ((no8 && no8.to_s =~ /(\d{5})(\d{3})/) and
-                                              @fridge.include?($1.to_s))
+          row << "%#{DAT_LEN[:CLAG]}s"  % if ppac && /Blutproduct|impfstoffe/.match(ppac[:list_code]) # COOL
                                             '1'
                                           else
                                             '0'

data/lib/oddb2xml/cli.rb

@@ -31,8 +31,7 @@ module Oddb2xml
       @migel   = {} # [addition] additional Non Pharma products from files repo
       @actions = [] # [addition] interactions from epha
       @orphan = [] # [addition] Orphaned drugs from Swissmedic xls
-      @fridge = [] # [addition] ReFridge drugs from Swissmedic xls
-      # addres
+      # addresses
       @companies = [] # betrieb
       @people    = [] # medizinalperson
       @_message = false
@@ -52,9 +51,7 @@ module Oddb2xml
           if @options[:fi]
             threads << download(:fachinfo) # swissmedic-info
           end
-          [:orphan, :fridge].each do |type|
-            threads << download(type) # swissmedic
-          end
+          threads << download(:orphan) # swissmedic
           threads << download(:interaction) # epha
         end
         if @options[:nonpharma]
@@ -116,7 +113,7 @@ module Oddb2xml
               builder.infos = @infos
               builder.packs = @packs
               # additional sources
-              %w[actions orphan fridge migel infos_zur_rose].each do |addition|
+              %w[actions orphan migel infos_zur_rose].each do |addition|
                 builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
               end
             end
@@ -179,7 +176,7 @@ module Oddb2xml
             @infos
           end
         end
-      when :orphan, :fridge
+      when :orphan
         var = what.to_s
         begin # instead of Thread.new do
           downloader = SwissmedicDownloader.new(what)

data/lib/oddb2xml/downloader.rb

@@ -262,9 +262,6 @@ module Oddb2xml
       when :orphan
         action = "arzneimittel/00156/00221/00222/00223/00224/00227/00228/index.html?lang=de"
         @xpath = "//div[@id='sprungmarke10_3']//a[@title='Humanarzneimittel']"
-      when :fridge
-        action = "arzneimittel/00156/00221/00222/00235/index.html?lang=de"
-        @xpath = "//div[@id='sprungmarke10_2']//a[@title='Excel-Version']"
       when :package
         action = "arzneimittel/00156/00221/00222/00230/index.html?lang=de"
         @xpath = "//div[@id='sprungmarke10_7']//a[@title='Excel-Version Zugelassene Verpackungen*']"

data/lib/oddb2xml/extractor.rb

@@ -214,18 +214,6 @@ module Oddb2xml
             data << sprintf("%05d", number)
           end
         end
-      when :fridge
-        row_explanation = 9
-        col_zulassung = 0
-        col_cool = 12
-        explanation = @sheet[row_explanation]
-        raise "Could not find Zulassungsnummer in column #{col_zulassung} of #{@filename}" unless /Zul.*Nr/.match(explanation[col_zulassung].value)
-        raise "Could not find Kühlkette in column #{col_cool}" unless /Kühlkette/.match(explanation[col_cool].value)
-        @sheet.each do |row|
-          if row[col_zulassung] and number = row[col_zulassung].value and row[col_cool] and row[col_cool].value.to_s.downcase == 'x'
-            data << sprintf("%05d", number)
-          end
-        end
       end
       cleanup_file
       # puts "found #{data.uniq.size} entities for type #{@type}"
@@ -492,6 +480,7 @@ module Oddb2xml
         data[ean13] = {
           :line   => line.chomp,
           :ean   => ean13,
+          :clag  => line[73],
           :vat   => line[96],
           :description => line[10..59].sub(/\s+$/, ''),
           :quantity => '',

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/spec/downloader_spec.rb

@@ -264,24 +264,6 @@ end
       end
     end
   end
-  context 'fridge' do
-    before(:each) do
-      VCR.eject_cassette
-      VCR.insert_cassette('oddb2xml', :tag => :swissmedic, :exclusive => false)
-      common_before
-      @downloader = Oddb2xml::SwissmedicDownloader.new(:fridge)
-    end
-    after(:each) do common_after end
-    context 'download_by for fridge xls' do
-      let(:bin) {
-        @downloader.download
-      }
-      it 'should return valid Binary-String' do
-        expect(bin).to be_a String
-        expect(bin.bytes).not_to be nil
-      end
-    end
-  end
   context 'package' do
     before(:each) do
       VCR.eject_cassette

data/spec/extractor_spec.rb

@@ -216,15 +216,6 @@ describe Oddb2xml::SwissmedicExtractor do
     end
   end
 
-  context 'can parse swissmedic_fridge.xlsx' do
-    it {
-        @filename = File.join(Oddb2xml::SpecData, 'swissmedic_fridge.xlsx')
-        @packs = Oddb2xml::SwissmedicExtractor.new(@filename, :fridge).to_arry
-        expect(@packs.size).to eq 16
-        expect(@packs[0]).to eq("58618")
-        expect(@packs[1]).to eq("00696")
-      }
-  end
   context 'can parse swissmedic_orphans.xls' do
     it {
         @filename = File.join(Oddb2xml::SpecData, 'swissmedic_orphan.xlsx')