diff --git a/History.txt b/History.txt
index c7fd3db..8ee55dc 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,9 @@
+=== 2.2.7 / 24.11.2015
+
+* Removed no more emitted QTY from definition of ART in oddb2xml.xsd
+* Fixed generating COOL in oddb_article.xml
+* Fixed generating ORPH in oddb_product.xml
+
=== 2.2.6 / 09.11.2015
* Fixed an error when generating oddb_calc.xml and we have no information for a given EAN, eg. 7680653150012
diff --git a/lib/oddb2xml/builder.rb b/lib/oddb2xml/builder.rb
index c47ed52..af68112 100644
--- a/lib/oddb2xml/builder.rb
+++ b/lib/oddb2xml/builder.rb
@@ -35,7 +35,7 @@ module Oddb2xml
}
class Builder
attr_accessor :subject, :refdata, :items, :flags, :lppvs,
- :actions, :migel, :orphans, :fridges,
+ :actions, :migel, :orphan, :fridge,
:infos, :packs, :infos_zur_rose,
:ean14, :tag_suffix,
:companies, :people,
@@ -52,8 +52,8 @@ def initialize(args = {})
@migel = {}
@infos_zur_rose = {} # zurrose
@actions = []
- @orphans = []
- @fridges = []
+ @orphan = []
+ @fridge = []
@ean14 = false
@companies = []
@people = []
@@ -533,7 +533,7 @@ def build_product
#xml.DRGFD
#xml.DRGFF
obj[:no8] =~ /(\d{5})(\d{3})/
- if @orphans.include?($1.to_s)
+ if @orphan.include?($1.to_s)
xml.ORPH true
end
#xml.BIOPHA
@@ -820,7 +820,7 @@ def build_article
#xml.GRDFR
if no8 and !no8.empty? and
no8.to_s =~ /(\d{5})(\d{3})/
- xml.COOL 1 if @fridges.include?($1.to_s)
+ xml.COOL 1 if @fridge.include?($1.to_s)
end
#xml.TEMP
if ean
@@ -1025,8 +1025,8 @@ def build_fi_product
xml.KP('DT' => '') {
xml.MONID @infos[lang][idx][:monid]
xml.PRDNO seq[:product_key] unless seq[:product_key].empty?
- # as orphans ?
- xml.DEL @orphans.include?(number) ? true : false
+ # as orphan ?
+ xml.DEL @orphan.include?(number) ? true : false
}
}
end
@@ -1240,7 +1240,7 @@ def build_dat
'3'
end
row << "%#{DAT_LEN[:CLAG]}s" % if ((no8 && no8.to_s =~ /(\d{5})(\d{3})/) and
- @fridges.include?($1.to_s))
+ @fridge.include?($1.to_s))
'1'
else
'0'
diff --git a/lib/oddb2xml/cli.rb b/lib/oddb2xml/cli.rb
index d224338..01d46b8 100644
--- a/lib/oddb2xml/cli.rb
+++ b/lib/oddb2xml/cli.rb
@@ -30,8 +30,8 @@ def initialize(args)
@infos_zur_rose = {} # [addition] infos_zur_rose and other infos from zurrose transfer.txt
@migel = {} # [addition] additional Non Pharma products from files repo
@actions = [] # [addition] interactions from epha
- @orphans = [] # [addition] Orphaned drugs from Swissmedic xls
- @fridges = [] # [addition] ReFridge drugs from Swissmedic xls
+ @orphan = [] # [addition] Orphaned drugs from Swissmedic xls
+ @fridge = [] # [addition] ReFridge drugs from Swissmedic xls
# addres
@companies = [] # betrieb
@people = [] # medizinalperson
@@ -89,7 +89,6 @@ def run
def build
Oddb2xml.log("Start build")
begin
- # require 'pry'; binding.pry
@_files = {"calc"=>"oddb_calc.xml"} if @options[:calc] and not @options[:extended]
files.each_pair do |sbj, file|
builder = Builder.new(@options) do |builder|
@@ -117,7 +116,7 @@ def build
builder.infos = @infos
builder.packs = @packs
# additional sources
- %w[actions orphans fridges migel infos_zur_rose].each do |addition|
+ %w[actions orphan fridge migel infos_zur_rose].each do |addition|
builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
end
end
@@ -181,13 +180,13 @@ def download(what, type=nil)
end
end
when :orphan, :fridge
- var = what.to_s + 's'
+ var = what.to_s
begin # instead of Thread.new do
downloader = SwissmedicDownloader.new(what)
bin = downloader.download
Oddb2xml.log("SwissmedicDownloader #{var} #{bin} #{File.size(bin)} bytes")
self.instance_variable_set(
- "@#{var}".intern,
+ "@#{var}",
items = SwissmedicExtractor.new(bin, what).to_arry
)
Oddb2xml.log("SwissmedicExtractor added #{items.size} #{var}. File #{bin} was #{File.size(bin)} bytes")
diff --git a/lib/oddb2xml/extractor.rb b/lib/oddb2xml/extractor.rb
index b2de016..d7511e5 100644
--- a/lib/oddb2xml/extractor.rb
+++ b/lib/oddb2xml/extractor.rb
@@ -212,17 +212,24 @@ def to_arry
case @type
when :orphan
i = 1
+ col_zulassung = 5
+ raise "Could not find Zulassungsnummer in column #{col_zulassung} of #{@filename}" unless /Zulassungs.*nummer/.match(@sheet[3][col_zulassung].value)
@sheet.each do |row|
- next unless row[1]
- number = row[1].value.to_i
+ next unless row[col_zulassung]
+ number = row[col_zulassung].value.to_i
if number != 0
data << sprintf("%05d", number)
end
end
when :fridge
- i,c = 1,7
+ row_explanation = 9
+ col_zulassung = 0
+ col_cool = 12
+ explanation = @sheet[row_explanation]
+ raise "Could not find Zulassungsnummer in column #{col_zulassung} of #{@filename}" unless /Zul.*Nr/.match(explanation[col_zulassung].value)
+ raise "Could not find Kühlkette in column #{col_cool}" unless /Kühlkette/.match(explanation[col_cool].value)
@sheet.each do |row|
- if row[i] and number = row[i].value and row[c] and row[c].value.to_s.downcase == 'x'
+ if row[col_zulassung] and number = row[col_zulassung].value and row[col_cool] and row[col_cool].value.to_s.downcase == 'x'
data << sprintf("%05d", number)
end
end
@@ -272,6 +279,7 @@ def to_hash # Packungen.xlsx COLUMNS_JULY_2015
next if (i <= 1)
next unless row and row[i_5] and row[i_3]
+ next unless row[i_5].value.to_i > 0 and row[i_3].value.to_i > 0
no8 = sprintf('%05d',row[i_5].value.to_i) + sprintf('%03d',row[i_3].value.to_i)
prodno = sprintf('%05d',row[i_5].value.to_i) + row[p_1_2].value.to_i.to_s
unless no8.empty?
diff --git a/oddb2xml.xsd b/oddb2xml.xsd
index 4eaeac0..c758db7 100644
--- a/oddb2xml.xsd
+++ b/oddb2xml.xsd
@@ -54,6 +54,8 @@
* Bezeichnung (DE / FR)
* QTY Quantity, e.g. 3 Flaschen 5 ml. The EAN13 specified that this package contains 3 bottles. Think of it as
as description of volume/size of the content.
+ The QTY is present in the oddb_product.xml, but not in the oddb_article.xml
+ In oddb_calc.xml you find QTY/UNIT, where QTY is a float and unit something like ml, mg, etc.
* ATC
* company_name (only for migel)
* GLN company_ean, field COMPNO in oddb_article
@@ -124,7 +126,6 @@
-