oddb2xml 2.4.8 → 2.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a1e0b3a5e0a14049a5831a11dcb9ea4e8f8624
-  data.tar.gz: ba585a9dad0d6543a0f223ee69884633cf48824f
+  metadata.gz: 2432c6a39cae058c3d84941d2a581fcaec5dd1f4
+  data.tar.gz: 05a3d47ffc5776e4e49e76447f292e44f17b46d6
 SHA512:
-  metadata.gz: 899bf1aa3cb7ea067e2b4aad688845219eacc57cf27b5bdec85a3bbb791ab71a31dee96f092441af0ee1ed45d8e8b5e15e0d5ebb32991c706c696e5a3841fdbf
-  data.tar.gz: 317682251587c2003d2effc9c9a77fbe7a2485ae4d1884360b55123f4011c61b99c940d61e12ef4642953d90ff6031962059d6eda09645b62bacc25af2e95805
+  metadata.gz: 9e6d97f8a5a36c043ad05996e6a5e262b05831696683f6694de016c97e1355b619cc2bee954a178d4b50dc3b487110312369f7e15bea6cbd2121747f3d539851
+  data.tar.gz: 37f965f52b2cebb6bd8407923c823d2bc22cc793587f12ce36abbb8a74255756b898bed92ff1ffbc62c2e79b0a332941e59aaacb7a4f8fcc91e667d85ef04ebd

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.4.9 / 15.01.2018
+
+* Adapt to new link of epha atc.csv
+* Ensure that transfer.dat lines have always the correct line length of 97
+
 === 2.4.8 / 20.11.2017
 
 * Adapt to new links of swissmedic download files

data/lib/oddb2xml/builder.rb

@@ -1182,20 +1182,10 @@ module Oddb2xml
       end
       date[0,len]
     end
-    def format_name(name)
-      if RUBY_VERSION.to_f < 1.9 # for multibyte chars length support
-        chars = name.scan(/./mu).to_a
-        diff  = DAT_LEN[:ABEZ] - chars.length
-        if diff > 0
-          chars += Array.new(diff, ' ')
-        elsif diff < 0
-          chars = chars[0,DAT_LEN[:ABEZ]]
-        end
-        chars.to_s
-      else
-        name = name[0,DAT_LEN[:ABEZ]] if name.length > DAT_LEN[:ABEZ]
-        "%-#{DAT_LEN[:ABEZ]}s" % name
-      end
+
+    # The migel name must be always 50 chars wide and in ISO 8859-1 format
+    def format_name(name, length)
+      ("%-#{length}s" % name)[0..length-1]
     end
     def build_dat
       prepare_articles
@@ -1248,7 +1238,12 @@ module Oddb2xml
             price_exf     = sprintf('%06i', (pac[:prices][:exf_price][:price].to_f*100).to_i) if pac[:prices][:exf_price] and pac[:prices][:exf_price][:price]
             price_public  = sprintf('%06i', (pac[:prices][:pub_price][:price].to_f*100).to_i) if pac[:prices][:pub_price] and pac[:prices][:pub_price][:price]
           end
-          row << format_name(abez)
+          row << format_name(Oddb2xml.patch_some_utf8(abez), DAT_LEN[:ABEZ])
+          if price_exf.to_s.length > DAT_LEN[:PRMO] ||
+             price_public.to_s.length > DAT_LEN[:PRPU]
+            puts "Price exfactory #{price_exf} or public #{price_public} is too high to be added into transfer.dat"
+            break
+          end
           row << "%#{DAT_LEN[:PRMO]}s"  % (price_exf ? price_exf.to_s : ('0' * DAT_LEN[:PRMO]))
           row << "%#{DAT_LEN[:PRPU]}s"  % (price_public ? price_public.to_s : ('0' * DAT_LEN[:PRPU]))
           row << "%#{DAT_LEN[:CKZL]}s"  % if (@lppvs[ean])
@@ -1303,9 +1298,9 @@ module Oddb2xml
             obj[:desc_de].to_s + " " +
           (obj[:quantity] ? obj[:quantity] : '')
           ).gsub(/"/, '')
-          row << format_name(abez)
-          row << "%#{DAT_LEN[:PRMO]}s"  % ('0' * DAT_LEN[:PRMO])
-          row << "%#{DAT_LEN[:PRPU]}s"  % ('0' * DAT_LEN[:PRPU])
+          row << format_name(Oddb2xml.patch_some_utf8(abez), DAT_LEN[:ABEZ])
+          row << '0' * DAT_LEN[:PRMO]
+          row << '0' * DAT_LEN[:PRPU]
           row << "%#{DAT_LEN[:CKZL]}s"  % '3' # sl_entry and lppv
           row << "%#{DAT_LEN[:CLAG]}s"  % '0'
           row << "%#{DAT_LEN[:CBGG]}s"  % '0'

data/lib/oddb2xml/extractor.rb

@@ -470,7 +470,7 @@ module Oddb2xml
     def to_hash
       data = {}
       while line = @io.gets
-        line = line.encode('utf-8').gsub("\u0089", "‰").gsub("\u0092", '’').gsub("\u0096", '-').chomp
+        line = Oddb2xml.patch_some_utf8(line)
         next if line =~ /(ad us\.* vet)|(\(vet\))/i
         if @@extended
           next unless line =~ /(\d{13})(\d{1})$/

data/lib/oddb2xml/util.rb

@@ -17,28 +17,27 @@ module Oddb2xml
     Downloads     = "#{Dir.pwd}/downloads"
   end
   @options = {}
-  @atc_csv_origin = 'https://raw.githubusercontent.com/epha/robot/master/data/manual/swissmedic/atc.csv'
+  @atc_csv_origin = 'http://download.epha.ch/data/atc/atc.csv'
   @atc_csv_content = {}
 
+  def Oddb2xml.patch_some_utf8(line)
+    begin
+      line.gsub("\u0089", "‰").gsub("\u0092", '’').gsub("\u0096", '-').gsub("\u2013",'-').gsub("\u201D", '"').chomp
+    rescue => error
+      puts "#{error}: in #{line}"
+      line
+    end
+  end
+
   def Oddb2xml.convert_to_8859_1(line)
     begin
       # We want to ignore lines which are not really UTF-8 encoded
-      return line.encode('ISO-8859-1')
+        ausgabe = Oddb2xml.patch_some_utf8(line).encode('ISO-8859-1')
+        ausgabe.encode('ISO-8859-1')
     rescue => error
-      ausgabe = ''
-      0.upto(line.size-1).each do |idx|
-        begin
-          if line[idx].ord == 8211
-            ausgabe += '-'
-          else
-            ausgabe += line[idx].encode('ISO-8859-1')
-          end
-        rescue => error
-          puts "#{error}: in #{line} at #{idx}"
-        end
-      end
+      puts "#{error}: in #{line}"
+      require 'pry'; binding.pry
     end
-    ausgabe.encode('ISO-8859-1')
   end
 
   def Oddb2xml.add_epha_changes_for_ATC(iksnr, atc_code)

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.4.8"
+  VERSION = "2.4.9"
 end

data/spec/fixtures/vcr_cassettes/oddb2xml.json

@@ -1025,7 +1025,7 @@
                     ]
                 },
                 "method": "get",
-                "uri": "https://raw.githubusercontent.com/epha/robot/master/data/manual/swissmedic/atc.csv"
+                "uri": "http://download.epha.ch/data/atc/atc.csv"
             },
             "response": {
                 "body": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.9
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip