Fixed NINCD for LPPV items

ngiger · Nov 25, 2015 · 72e3452 · 72e3452
1 parent 3ad6a1d
commit 72e3452
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/History.txt b/History.txt
@@ -1,7 +1,7 @@
 === 2.2.8 / ?????
 
 * Improved spec tests against all XSD elements
-* NINCD with value 20 LPPV is never generated
+* Fixed NINCD for LPPV items
 
 === 2.2.7 / 24.11.2015
 

diff --git a/lib/oddb2xml/builder.rb b/lib/oddb2xml/builder.rb
@@ -1103,7 +1103,7 @@ def build_person
       Oddb2xml.add_hash(_builder.to_xml)
     end
     def detect_nincd(de_idx)
-      if @lppvs[de_idx[:ean]] # LPPV
+      if @lppvs[de_idx[:ean].to_s] # LPPV
         20
       elsif @items[de_idx[:pharmacode]] # BAG-XML (SL/LS)
         10

diff --git a/lib/oddb2xml/downloader.rb b/lib/oddb2xml/downloader.rb
@@ -183,7 +183,7 @@ def download
       file = File.join(WorkDir, 'XMLPublications.zip')
       Oddb2xml.log "BagXmlDownloader #{__LINE__}: #{file}"
       unless Oddb2xml.skip_download(file)
-        Oddb2xml.log "BagXmlDownloader #{__LINE__}: #{file}"                                       
+        Oddb2xml.log "BagXmlDownloader #{__LINE__}: #{file}"
         begin
           response = @agent.get(@url)
           response.save_as(file)

diff --git a/spec/data/swissmedic_package.xlsx b/spec/data/swissmedic_package.xlsx
diff --git a/spec/downloader_spec.rb b/spec/downloader_spec.rb
@@ -385,6 +385,7 @@ def unzip_files(zipfile_name, directory=Dir.pwd)
   it_behaves_like 'any downloader'
   context 'when download is called' do
     let(:xml) {
+      VCR.eject_cassette
       VCR.use_cassette('oddb2xml', :tag => :bag_xml) do
         @downloader.download
       end

diff --git a/spec/extractor_spec.rb b/spec/extractor_spec.rb
@@ -4,7 +4,7 @@
 require "#{Dir.pwd}/lib/oddb2xml/downloader"
 ENV['TZ'] = 'UTC' # needed for last_change
 LAST_CHANGE = "2015-07-03 00:00:00 +0000"
-NR_PACKS = 23
+NR_PACKS = 24
 
 def common_before
   @savedDir = Dir.pwd