oddb2xml 1.5.3 → 1.5.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.5.4 / 08.07.2013
+
+* Update to import  VAT from zurrose transfer.dat
+
 === 1.5.3 / 08.07.2013
 
 *  Add -p option for zurrose transfer.dat

data/lib/oddb2xml/builder.rb

@@ -543,6 +543,10 @@ module Oddb2xml
               if no8
                 ppac = ((_ppac = @packs[no8.intern] and !_ppac[:is_tier]) ? _ppac : nil)
               end
+              price = nil
+              if !@prices.empty? && de_idx[:ean] && @prices[de_idx[:ean]]
+                price = @prices[de_idx[:ean]] # zurrose
+              end
               xml.ART('DT' => '') {
                 xml.PHAR  de_idx[:pharmacode] unless de_idx[:pharmacode].empty?
                 #xml.GRPCD
@@ -559,7 +563,10 @@ module Oddb2xml
                 #xml.HOSPCD
                 #xml.CLINCD
                 #xml.ARTTYP
-                #xml.VAT
+                if price
+                  xml.VAT price[:vat]
+                end
+
                 if de_idx
                   xml.SALECD(de_idx[:status].empty? ? 'N' : de_idx[:status])
                 end
@@ -646,12 +653,11 @@ module Oddb2xml
                   #xml.LINENO
                   #xml.NOUNITS
                 #}
-                if !@prices.empty? && de_idx[:ean] && \
-                  price = @prices[de_idx[:ean]] # zurrose
+                if price # zurrose
                   xml.ARTPRI {
                    xml.VDAT  datetime
                    xml.PTYP  "ZURROSE"
-                   xml.PRICE price
+                   xml.PRICE price[:price]
                   }
                 elsif pac
                   pac[:prices].each_pair do |key, price|

data/lib/oddb2xml/downloader.rb

@@ -114,7 +114,7 @@ module Oddb2xml
   class ZurroseDownloader < Downloader
     include DownloadMethod
     def download
-      @url ||= 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/DOS/IGM01_ohne_MwSt/Vollstamm/transfer.dat'
+      @url ||= 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/ProduktUpdate/IGM11_mit_MwSt/Vollstamm/transfer.dat'
       download_as('oddb2xml_zurrose_transfer.dat', 'r:iso-8859-1:utf-8')
     end
   end

data/lib/oddb2xml/extractor.rb

@@ -414,10 +414,11 @@ module Oddb2xml
     def to_hash
       data = {}
       while line = @io.gets
-        next unless line =~ /(7680\d{9})\r\n$/
-        ean   = $1.to_s
-        price = line[60,6].gsub(/(\d{2})$/, "." + $1.to_s).to_f.round(2).to_s
-        data[ean] = price
+        next unless line =~ /(7680\d{9})(\d{1})\r\n$/
+        data[$1.to_s] = {
+         :vat   => $2.to_s,
+         :price => line[60,6].gsub(/(\d{2})$/, "." + $1.to_s).to_f.round(2).to_s
+        }
       end
       data
     end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/spec/spec_helper.rb

@@ -230,7 +230,7 @@ module ServerMockHelper
   end
   def setup_zurrose_server_mock
     # dat
-    stub_dat_url  = 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/DOS/IGM01_ohne_MwSt/Vollstamm/transfer.dat'
+    stub_dat_url  = 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/ProduktUpdate/IGM11_mit_MwSt/Vollstamm/transfer.dat'
     stub_response = File.read(File.expand_path('../data/zurrose_transfer.dat', __FILE__))
     stub_request(:get, stub_dat_url).
       with(:headers => {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oddb2xml
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 5
-  - 3
-  version: 1.5.3
+  - 4
+  version: 1.5.4
 platform: ruby
 authors: 
 - Yasuhiro Asaka, Zeno R.R. Davatz