oddb2xml 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1338186e814bba29ae165b55961634b87ceab658
-  data.tar.gz: 8f736fba9dd08fa2f44a4577bc97ca43cfb98d0b
+  metadata.gz: 5231618926015f8fe6730a4bb96e5c1b02bcd7a6
+  data.tar.gz: 46d8563881526d72bfafa74d328b599e59f5ead8
 SHA512:
-  metadata.gz: 8f81d0c6c7ab027561bad9d42c0b21c3450727166669e58c7c06671c73d2a27e71bdd5a1cb594b0a53daaeda1ea554dfc66f36f3cc2ead081b59aadcbcb0c442
-  data.tar.gz: cf3ad5e44a0be9b48488403adca881244ef083bf77b6d96e3c36ea7ad53710189348c5ac0c6869ceecd3b4b1b49272dad1172ae33e84c6ad9745e3a541e1ab6f
+  metadata.gz: bcaad4b40f4e4a353c8d81a0628a766f71072926365ab4227b28c495448ef504f7a3870b13cbbe1ce6bc32f47f18ad844d6bade36f5ac4118275352361eaf044
+  data.tar.gz: c34d48f22e6f16b235695f1fe911d0249884287d0f787ec891b3cd4db7d145a3c60b011b91c0228c7af33db0d5d61fdbb5c521ff197ca682d82a111506524abd

data/.gitignore

@@ -15,3 +15,21 @@ test/tmp
 test/version_tmp
 tmp
 .ruby-version
+*#
+# Ignore downloaded files
+.project
+.buildpath
+/*.xlsx
+/oddb_*.xml
+/oddb_*.txt
+/oddb2xml*.txt
+/spec/run
+/*tar.gz
+/*.patch
+/ausgabe
+/downloads
+/duplicate_ean13_from_zur_rose.txt
+/epha_interactions.csv
+/missing_in_refdata.txt
+/oddb2xml_files_nonpharma.xls
+/oddb_calc.csv

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.2.6)
+    oddb2xml (2.2.7)
       archive-tar-minitar
       httpi (>= 2.4.1)
       mechanize
@@ -25,17 +25,16 @@ GEM
     archive-tar-minitar (0.5.2)
     blankslate (3.1.3)
     builder (3.2.2)
-    byebug (4.0.5)
-      columnize (= 0.9.0)
+    byebug (8.2.0)
     coderay (1.1.0)
-    columnize (0.9.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     gyoku (1.3.1)
       builder (>= 2.1.2)
+    hashdiff (0.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     httpi (2.4.1)
@@ -51,23 +50,23 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mini_portile (0.6.2)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     nori (2.6.0)
     ntlm-http (0.1.1)
-    parslet (1.7.0)
+    parslet (1.7.1)
       blankslate (>= 2.0, <= 4.0)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.1.0)
-      byebug (~> 4.0)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
       pry (~> 0.10)
     pry-doc (0.8.0)
       pry (~> 0.9)
@@ -76,21 +75,21 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     ruby-ole (1.2.11.8)
-    rubyXL (3.3.10)
+    rubyXL (3.3.15)
       nokogiri (>= 1.4.4)
       rubyzip (>= 1.1.6)
     rubyntlm (0.5.1)
@@ -106,19 +105,20 @@ GEM
       wasabi (~> 3.4)
     sax-machine (1.3.2)
     slop (3.6.0)
-    spreadsheet (1.0.3)
+    spreadsheet (1.0.9)
       ruby-ole (>= 1.0)
-    timecop (0.7.4)
+    timecop (0.8.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    vcr (2.9.3)
+    vcr (3.0.0)
     wasabi (3.5.0)
       httpi (~> 2.0)
       nokogiri (>= 1.4.2)
-    webmock (1.21.0)
+    webmock (1.22.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
     webrobots (0.1.1)
     yard (0.8.7.6)
 

data/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

data/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 @@ module Oddb2xml
       @migel      = {}
       @infos_zur_rose     = {} # zurrose
       @actions    = []
-      @orphans    = []
-      @fridges    = []
+      @orphan    = []
+      @fridge    = []
       @ean14      = false
       @companies  = []
       @people     = []
@@ -533,7 +533,7 @@ module Oddb2xml
               #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 @@ module Oddb2xml
               #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 @@ module Oddb2xml
                                          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 @@ module Oddb2xml
                                             '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'

data/lib/oddb2xml/cli.rb

@@ -30,8 +30,8 @@ module Oddb2xml
       @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 @@ module Oddb2xml
     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 @@ module Oddb2xml
               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 @@ module Oddb2xml
           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")

data/lib/oddb2xml/extractor.rb

@@ -212,17 +212,24 @@ module Oddb2xml
       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 @@ module Oddb2xml
 
           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?

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.2.6"
+  VERSION = "2.2.7"
 end

data/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 @@
           <xs:element ref="ns1:CDBG"/>
           <xs:element ref="ns1:BG"/>
         </xs:sequence>
-        <xs:element minOccurs="0" ref="ns1:QTY"/>
         <xs:element ref="ns1:DSCRD"/>
         <xs:element ref="ns1:DSCRF"/>
         <xs:element ref="ns1:SORTD"/>