oddb2xml 1.3.3 → 1.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/History.txt +7 -0
- data/lib/oddb2xml/builder.rb +5 -3
- data/lib/oddb2xml/cli.rb +4 -1
- data/lib/oddb2xml/extractor.rb +10 -10
- data/lib/oddb2xml/version.rb +1 -1
- metadata +28 -28
data/History.txt
CHANGED
@@ -1,3 +1,10 @@
|
|
1
|
+
=== 1.3.4 / 06.02.2013
|
2
|
+
|
3
|
+
* Remove ORPH tag if value is false
|
4
|
+
* Fix a bug for extract of SwissmedicNumber
|
5
|
+
* Change priority of limitation ID key
|
6
|
+
* Update unique key of limitation entries
|
7
|
+
|
1
8
|
=== 1.3.3 / 05.02.2013
|
2
9
|
|
3
10
|
* Add spec example for downloading of Packungen.xls
|
data/lib/oddb2xml/builder.rb
CHANGED
@@ -116,8 +116,8 @@ module Oddb2xml
|
|
116
116
|
end
|
117
117
|
end
|
118
118
|
# ID is no longer fixed TAG (swissmedicNo8, swissmedicNo5, pharmacode)
|
119
|
-
# limitation.xml needs all duplicate entries
|
120
|
-
|
119
|
+
# limitation.xml needs all duplicate entries by this keys.
|
120
|
+
@limitations.uniq! {|lim| lim[:id] + lim[:type] }
|
121
121
|
@limitations.sort_by!{|lim| lim[:code] }
|
122
122
|
end
|
123
123
|
end
|
@@ -411,7 +411,9 @@ module Oddb2xml
|
|
411
411
|
#xml.DRGFD
|
412
412
|
#xml.DRGFF
|
413
413
|
pac[:swissmedic_number8] =~ /(\d{5})(\d{3})/
|
414
|
-
|
414
|
+
if @orphans.include?($1.to_s)
|
415
|
+
xml.ORPH true
|
416
|
+
end
|
415
417
|
#xml.BIOPHA
|
416
418
|
#xml.BIOSIM
|
417
419
|
#xml.BFS
|
data/lib/oddb2xml/cli.rb
CHANGED
@@ -145,7 +145,10 @@ module Oddb2xml
|
|
145
145
|
Thread.new do
|
146
146
|
downloader = SwissmedicDownloader.new(type)
|
147
147
|
bin = downloader.download
|
148
|
-
self.instance_variable_set(
|
148
|
+
self.instance_variable_set(
|
149
|
+
"@#{type.to_s}".intern,
|
150
|
+
SwissmedicExtractor.new(bin, type).to_arry
|
151
|
+
)
|
149
152
|
end
|
150
153
|
when :interaction
|
151
154
|
Thread.new do
|
data/lib/oddb2xml/extractor.rb
CHANGED
@@ -83,19 +83,16 @@ module Oddb2xml
|
|
83
83
|
key = ''
|
84
84
|
id = ''
|
85
85
|
case lim_key
|
86
|
+
when :seq, :itc
|
87
|
+
key = :swissmedic_number5
|
88
|
+
id = item[key].to_s
|
86
89
|
when :pac
|
87
90
|
key = :swissmedic_number8
|
88
91
|
id = item[:packages][phar][key].to_s
|
89
|
-
when :seq
|
90
|
-
key = :swissmedic_number5
|
91
|
-
id = item[key].to_s
|
92
|
-
when :itc
|
93
|
-
key = :pharmacode
|
94
|
-
id = phar
|
95
92
|
end
|
96
93
|
if id.empty? or id == '0'
|
97
94
|
key = :pharmacode
|
98
|
-
id = phar
|
95
|
+
id = phar.to_s
|
99
96
|
end
|
100
97
|
lims.each do |lim|
|
101
98
|
limitation = {
|
@@ -178,14 +175,14 @@ module Oddb2xml
|
|
178
175
|
i = 1
|
179
176
|
@sheet.each do |row|
|
180
177
|
if number = extract_number(row, i)
|
181
|
-
data << number
|
178
|
+
data << number.to_s
|
182
179
|
end
|
183
180
|
end
|
184
181
|
when :fridges
|
185
182
|
i,c = 1,7
|
186
183
|
@sheet.each do |row|
|
187
184
|
if number = extract_number(row, i) and row[c] and row[c].to_s == 'x'
|
188
|
-
data << row[i].
|
185
|
+
data << row[i].to_s
|
189
186
|
end
|
190
187
|
end
|
191
188
|
end
|
@@ -213,7 +210,10 @@ module Oddb2xml
|
|
213
210
|
private
|
214
211
|
def extract_number(row, i, ptrn=/^\d{5}$/)
|
215
212
|
begin
|
216
|
-
|
213
|
+
return nil unless row[i]
|
214
|
+
number = row[i].to_i.to_s.gsub(/[^0-9]/, '')
|
215
|
+
number = number.rjust(5, '0') if ptrn == /^\d{5}$/
|
216
|
+
if number =~ ptrn
|
217
217
|
return number
|
218
218
|
else
|
219
219
|
nil
|
data/lib/oddb2xml/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: oddb2xml
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-02-
|
12
|
+
date: 2013-02-06 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rubyzip
|
16
|
-
requirement: &
|
16
|
+
requirement: &16544160 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *16544160
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: archive-tar-minitar
|
27
|
-
requirement: &
|
27
|
+
requirement: &16543540 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *16543540
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: mechanize
|
38
|
-
requirement: &
|
38
|
+
requirement: &16542680 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *16542680
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: nokogiri
|
49
|
-
requirement: &
|
49
|
+
requirement: &16541820 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *16541820
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: savon
|
60
|
-
requirement: &
|
60
|
+
requirement: &16541100 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '2.0'
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *16541100
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: spreadsheet
|
71
|
-
requirement: &
|
71
|
+
requirement: &16540340 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *16540340
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: rspec
|
82
|
-
requirement: &
|
82
|
+
requirement: &16539380 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *16539380
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: webmock
|
93
|
-
requirement: &
|
93
|
+
requirement: &16538660 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: '0'
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *16538660
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: ZenTest
|
104
|
-
requirement: &
|
104
|
+
requirement: &16537280 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: '0'
|
110
110
|
type: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *16537280
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: hoe
|
115
|
-
requirement: &
|
115
|
+
requirement: &16536600 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - ! '>='
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: '3.4'
|
121
121
|
type: :development
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *16536600
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: rdoc
|
126
|
-
requirement: &
|
126
|
+
requirement: &16536040 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - ! '>='
|
@@ -131,10 +131,10 @@ dependencies:
|
|
131
131
|
version: '0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
|
-
version_requirements: *
|
134
|
+
version_requirements: *16536040
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: rdoc
|
137
|
-
requirement: &
|
137
|
+
requirement: &16535280 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ~>
|
@@ -142,10 +142,10 @@ dependencies:
|
|
142
142
|
version: '3.10'
|
143
143
|
type: :development
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *16535280
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: hoe
|
148
|
-
requirement: &
|
148
|
+
requirement: &16534720 !ruby/object:Gem::Requirement
|
149
149
|
none: false
|
150
150
|
requirements:
|
151
151
|
- - ~>
|
@@ -153,7 +153,7 @@ dependencies:
|
|
153
153
|
version: '2.13'
|
154
154
|
type: :development
|
155
155
|
prerelease: false
|
156
|
-
version_requirements: *
|
156
|
+
version_requirements: *16534720
|
157
157
|
description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
|
158
158
|
email: yasaka@ywesee.com, zdavatz@ywesee.com
|
159
159
|
executables:
|