oddb2xml 2.8.2 → 2.8.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/oddb2xml/cli.rb +6 -4
- data/lib/oddb2xml/downloader.rb +1 -1
- data/lib/oddb2xml/options.rb +5 -4
- data/lib/oddb2xml/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f6d013a66a9290aa9adf042bf0c29927c6489f6bef13ce32404f65f8f3c82bf8
|
4
|
+
data.tar.gz: 4a2e2c51856ef0442c55890004d67c95f9c345dd5483c9f0fc1e05a9455e344e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6f8c5c08b502c892d17ea3b54f97f5c83ad5134872c9fb8a01266e109785512c59f7eaa0f890092ab8876c3a12a1974aa2d61707a0ac743f0c034e4bf9882c7a
|
7
|
+
data.tar.gz: f1bb522c9afbf5848f828ef0edd6987532efb534a926358a52c59fe3dd30395c4a5fad8409eca581e0845dff354b895ec3e0008cb5ee8d0b64ee508af1cb3b99
|
data/Gemfile.lock
CHANGED
data/lib/oddb2xml/cli.rb
CHANGED
@@ -40,7 +40,7 @@ module Oddb2xml
|
|
40
40
|
start_time = Time.now
|
41
41
|
files2rm = Dir.glob(File.join(DOWNLOADS, "*"))
|
42
42
|
FileUtils.rm_f(files2rm, verbose: true) if (files2rm.size > 0) && !Oddb2xml.skip_download?
|
43
|
-
if @options[:calc] && !(@options[:extended])
|
43
|
+
if @options[:calc] && !(@options[:extended] || @options[:firstbase])
|
44
44
|
threads << download(:package) # swissmedic
|
45
45
|
elsif @options[:address]
|
46
46
|
[:company, :person].each do |type|
|
@@ -106,9 +106,9 @@ module Oddb2xml
|
|
106
106
|
private
|
107
107
|
|
108
108
|
def build
|
109
|
-
@the_files = {"calc" => "oddb_calc.xml"} if @options[:calc] && !(@options[:extended] || @options[:artikelstamm])
|
109
|
+
@the_files = {"calc" => "oddb_calc.xml"} if @options[:calc] && !(@options[:extended] || @options[:artikelstamm] || @options[:firstbase])
|
110
110
|
builder = Builder.new(@options) do |builder|
|
111
|
-
if @options[:calc] && !(@options[:extended] || @options[:artikelstamm])
|
111
|
+
if @options[:calc] && !(@options[:extended] || @options[:artikelstamm] || @options[:firstbase])
|
112
112
|
builder.packs = @packs
|
113
113
|
elsif @options[:address]
|
114
114
|
builder.companies = @companies
|
@@ -343,7 +343,9 @@ module Oddb2xml
|
|
343
343
|
def files
|
344
344
|
unless @the_files
|
345
345
|
@the_files = {}
|
346
|
-
|
346
|
+
if @options[:calc]
|
347
|
+
@the_files[:calc] = "oddb_calc.xml"
|
348
|
+
end
|
347
349
|
if @options[:artikelstamm]
|
348
350
|
@the_files[:artikelstamm] = "artikelstamm_#{Date.today.strftime("%d%m%Y")}_v5.xml"
|
349
351
|
elsif @options[:address]
|
data/lib/oddb2xml/downloader.rb
CHANGED
@@ -386,7 +386,7 @@ module Oddb2xml
|
|
386
386
|
BASE_URL = "https://www.firstbase.ch"
|
387
387
|
include DownloadMethod
|
388
388
|
def initialize(type = :orphan, options = {})
|
389
|
-
@url = BASE_URL + "/sites/default/files/2023-
|
389
|
+
@url = BASE_URL + "/sites/default/files/2023-11/firstbase_healthcare_public_data-dump%2C%2020231109.xlsx"
|
390
390
|
end
|
391
391
|
|
392
392
|
def download
|
data/lib/oddb2xml/options.rb
CHANGED
@@ -55,6 +55,11 @@ module Oddb2xml
|
|
55
55
|
@opts.delete(:increment)
|
56
56
|
@opts[:nonpharma] = @opts[:append]
|
57
57
|
@opts.delete(:append)
|
58
|
+
if @opts[:firstbase]
|
59
|
+
@opts[:nonpharma] = true
|
60
|
+
# https://github.com/zdavatz/oddb2xml/issues/76
|
61
|
+
@opts[:calc] = true
|
62
|
+
end
|
58
63
|
if @opts[:extended]
|
59
64
|
@opts[:nonpharma] = true
|
60
65
|
@opts[:price] = :zurrose
|
@@ -64,10 +69,6 @@ module Oddb2xml
|
|
64
69
|
@opts[:extended] = true
|
65
70
|
@opts[:price] = :zurrose
|
66
71
|
end
|
67
|
-
if @opts[:firstbase]
|
68
|
-
@opts[:nonpharma] = true
|
69
|
-
@opts[:calc] = true
|
70
|
-
end
|
71
72
|
@opts[:price] = :zurrose if @opts[:price].is_a?(TrueClass)
|
72
73
|
@opts[:price] = @opts[:price].to_sym if @opts[:price]
|
73
74
|
@opts[:ean14] = @opts[:include]
|
data/lib/oddb2xml/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: oddb2xml
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.8.
|
4
|
+
version: 2.8.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-11-
|
11
|
+
date: 2023-11-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rubyzip
|