oddb2xml 1.6.5 → 1.6.6

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.6.6 / 12.12.2013
+
+* Added spec for generating *.dat file
+* Output prices in *.dat for articles without a pharmacode
+
 === 1.6.5 / 11.12.2013
 
 * Create data/download only if options[:skip_download]

data/lib/oddb2xml/builder.rb

@@ -395,7 +395,7 @@ module Oddb2xml
               xml.GTIN ean
               ppac = ((_ppac = @packs[ean[4..11].intern] and !_ppac[:is_tier]) ? _ppac : {})
               unless ppac
-                 ppac = @packs.find{|pac| pac.ean == ean }.first               
+                ppac = @packs.find{|pac| pac.ean == ean }.first
               end
               xml.PRODNO ppac[:prodno] if ppac[:prodno] and !ppac[:prodno].empty?
               if seq
@@ -958,19 +958,26 @@ module Oddb2xml
       rows = []
       @articles.each do |obj|
         obj[:de].each_with_index do |idx, i|
-          next if ((idx[:ean].to_s.length != 13) and !ean14)
+          ean = idx[:ean]
+          next if ((ean.to_s.length != 13) and !ean14)
           row = ''
           # Oddb2tdat.parse
           if idx[:status] =~ /A|I/
             pac,no8 = nil,nil
             if obj[:seq]
               pac = obj[:seq][:packages][idx[:pharmacode]]
-              pac = obj[:seq][:packages][idx[:ean]] unless pac
+              pac = obj[:seq][:packages][ean] unless pac
+            else
+              pac = @items[ean][:packages][ean] if @items and @items[ean]
             end
-            # :swissmedic_numbers
+             # :swissmedic_numbers
             if pac
               no8 = pac[:swissmedic_number8].intern
             end
+            if pac and pac[:prices] == nil and no8
+              ppac = ((ppac = @packs[no8.intern] and ppac[:is_tier]) ? ppac : nil)
+              pac = ppac if ppac
+            end
             row << "%#{DAT_LEN[:RECA]}s"  % '11'
             row << "%#{DAT_LEN[:CMUT]}s"  % if (phar = idx[:pharmacode] and phar.size > 3) # does not check expiration_date
                                               idx[:status] == "I" ? '3' : '1'
@@ -986,7 +993,7 @@ module Oddb2xml
             row << format_name(abez)
             row << "%#{DAT_LEN[:PRMO]}s"  % (pac ? format_price(pac[:prices][:exf_price][:price].to_s) : ('0' * DAT_LEN[:PRMO]))
             row << "%#{DAT_LEN[:PRPU]}s"  % (pac ? format_price(pac[:prices][:pub_price][:price].to_s) : ('0' * DAT_LEN[:PRPU]))
-            row << "%#{DAT_LEN[:CKZL]}s"  % if (@lppvs[idx[:ean]])
+            row << "%#{DAT_LEN[:CKZL]}s"  % if (@lppvs[ean])
                                               '2'
                                             elsif pac # sl_entry
                                               '1'
@@ -1000,7 +1007,7 @@ module Oddb2xml
                                               '0'
                                             end
             row << "%#{DAT_LEN[:CBGG]}s"  % if ((pac && pac[:narcosis_flag] == 'Y') or # BAGXml
-                                                (@flags[idx[:ean]]))                   # ywesee BM_update
+                                                (@flags[ean]))                   # ywesee BM_update
                                               '3'
                                             else
                                               '0'
@@ -1015,7 +1022,7 @@ module Oddb2xml
                                             else
                                               ('0' * DAT_LEN[:ITHE])
                                             end.to_i
-            row << "%0#{DAT_LEN[:CEAN]}d" % idx[:ean].to_i
+            row << "%0#{DAT_LEN[:CEAN]}d" % ean.to_i
             row << "%#{DAT_LEN[:CMWS]}s"  % '2' # pharma
             rows << row
           end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.6.5"
+  VERSION = "1.6.6"
 end

data/spec/builder_spec.rb

@@ -59,12 +59,12 @@ describe Oddb2xml::Builder do
       article_xml.should match(/<SMNO>53662013</) 
       article_xml.should match(/<DSCRD>3TC Filmtabl 150 mg</) 
       article_xml.should match(/<COMPNO>7601001392175</) 
-      article_xml.should match(/<BC>7680536620137</) 
-      article_xml.should match(/<VDAT>01.10.2011</) 
-      article_xml.should match(/<PTYP>PEXF</) 
-      article_xml.should match(/<PRICE>164.55</) 
-      article_xml.should match(/<PTYP>PPUB</) 
-      article_xml.should match(/<PRICE>205.3</) 
+      article_xml.should match(/<BC>7680536620137</)
+      article_xml.should match(/<VDAT>01.10.2011</)
+      article_xml.should match(/<PTYP>PEXF</)
+      article_xml.should match(/<PRICE>164.55</)
+      article_xml.should match(/<PTYP>PPUB</)
+      article_xml.should match(/<PRICE>205.3</)
       
       article_xml.should match(/Levetiracetam DESITIN/i) # 
       article_xml.should match(/7680536620137/) # Pharmacode
@@ -79,5 +79,25 @@ describe Oddb2xml::Builder do
       article_xml.should match(/<COMPNO>7601001320451</)
     end
   end
+  
+  context 'when -a nonpharma -f dat is given' do
+    let(:cli) do
+      opts = {
+        :nonpharma    => 'true',
+        :format       => :dat,
+      }
+      Oddb2xml::Cli.new(opts)
+    end    
+    it 'should generate a valid oddb_with_migel.dat' do
+      res = capture(:stdout){ cli.run }
+      res.should match(/products/)
+      dat_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_with_migel.dat'))
+      File.exists?(dat_filename).should be_true
+      oddb_dat = IO.read(dat_filename)
+#      $stdout.puts oddb_dat
+#      return
+      oddb_dat.should match(/1115819012LEVETIRACETAM DESITIN Filmtabl 250 mg 30 Stk      001349002780100B010710076806206900842/) 
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip