oddb2xml 1.3.7 → 1.3.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.3.8 / 09.02.2013
+
+* Add valid INDEX entries to product.xml
+
 === 1.3.7 / 08.02.2013
 
 * Add more Tags to product.xml from Packungen.xls

data/lib/oddb2xml/builder.rb

@@ -146,7 +146,6 @@ module Oddb2xml
         @products = []
         @index['DE'].each_pair do |phar, indices|
           indices.each_with_index do |index, i|
-            obj = {}
             obj = {
               :seq => @items[phar],
               :pac => nil,
@@ -158,27 +157,27 @@ module Oddb2xml
               :ean => index[:ean],
               :atc => index[:atc_code],
               :ith => '',
-              # from Packungen.xls
               :siz => '',
               :eht => '',
               :sub => '',
             }
-            if obj[:seq] and obj[:pac] = obj[:seq][:packages][phar]
-              obj[:no8] = obj[:pac][:swissmedic_number8].to_s
-              obj[:atc] = obj[:pac][:atc_code].to_s
-              if obj[:no8] and ppac = @packs[obj[:no8].intern] # Packungen.xls
-                unless obj[:ean]
-                  obj[:ean] = ppac[:ean].to_s
-                end
-                # sync ATC-code via EAN
-                if obj[:ean] == ppac[:ean].to_s
-                  obj[:atc] = ppac[:atc_code].to_s
-                end
-                obj[:ith] = ppac[:ith_swissmedic]
-                obj[:siz] = ppac[:package_size]
-                obj[:eht] = ppac[:einheit_swissmedic]
-                obj[:sub] = ppac[:substance_swissmedic]
+            if obj[:ean] # via EAN-Code
+              obj[:no8] = obj[:ean][4..11]
+            end
+            if obj[:no8] and ppac = @packs[obj[:no8].intern] and # Packungen.xls
+               !ppac[:is_tier]
+              # If swissINDEX does not have EAN
+              if obj[:ean].nil? or obj[:ean].empty?
+                obj[:ean] = ppac[:ean].to_s
               end
+              # If swissINDEX dose not have ATC-Code
+              if obj[:atc].nil? or obj[:atc].empty?
+                obj[:atc] = ppac[:atc_code].to_s
+              end
+              obj[:ith] = ppac[:ith_swissmedic]
+              obj[:siz] = ppac[:package_size]
+              obj[:eht] = ppac[:einheit_swissmedic]
+              obj[:sub] = ppac[:substance_swissmedic]
             end
             if obj[:ean][0..3] == '7680'
               @products << obj
@@ -384,7 +383,6 @@ module Oddb2xml
           length = 0
           @products.each do |obj|
             seq = obj[:seq]
-            next unless seq # option
             length += 1
             xml.PRD('DT' => '') {
               xml.GTIN obj[:ean].to_s
@@ -529,15 +527,14 @@ module Oddb2xml
         ) {
           @articles.each do |obj|
             obj[:de].each_with_index do |de_idx, i|
-              fr_idx = obj[:fr][i] # swiss index FR
-              pac,no8 = nil,nil    # BAG XML (additional data)
-              ppac = nil           # Packungen
+              fr_idx = obj[:fr][i]              # swiss index FR
+              pac,no8 = nil,de_idx[:ean][4..11] # BAG XML (additional data)
+              ppac = nil                        # Packungen
               if obj[:seq]
                 pac = obj[:seq][:packages][de_idx[:pharmacode]]
-                if pac
-                  no8  = pac[:swissmedic_number8].intern
-                  ppac = @packs[no8]
-                end
+              end
+              if no8
+                ppac = ((_ppac = @packs[no8.intern] and !_ppac[:is_tier]) ? _ppac : nil)
               end
               xml.ART('DT' => '') {
                 xml.PHAR  de_idx[:pharmacode] unless de_idx[:pharmacode].empty?
@@ -545,10 +542,10 @@ module Oddb2xml
                 #xml.CDS01
                 #xml.CDS02
                 #xml.PRDNO
-                if pac && ppac && ppac[:swissmedic_category]
+                if ppac && ppac[:swissmedic_category]
                   xml.SMCAT ppac[:swissmedic_category]
                 end
-                if pac
+                if no8
                   xml.SMNO no8.to_s unless no8.to_s.empty?
                 end
                 #xml.HOSPCD
@@ -563,11 +560,9 @@ module Oddb2xml
                   xml.LIMPTS pac[:limitation_points] unless pac[:limitation_points].empty?
                 end
                 #xml.GRDFR
-                if pac
-                  if no8.empty? and
-                     no8.to_s =~ /(\d{5})(\d{3})/
-                    xml.COOL 1 if @fridges.include?($1.to_s)
-                  end
+                if no8 and !no8.empty? and
+                   no8.to_s =~ /(\d{5})(\d{3})/
+                  xml.COOL 1 if @fridges.include?($1.to_s)
                 end
                 #xml.TEMP
                 unless de_idx[:ean].empty?
@@ -860,12 +855,12 @@ module Oddb2xml
                                             else
                                               '0'
                                             end
-            row << "%#{DAT_LEN[:CIKS]}s"  % if (no8 && @packs[no8]) # Packungen.xls
+            row << "%#{DAT_LEN[:CIKS]}s"  % if (no8 && @packs[no8] && !@packs[no8][:is_tier]) # Packungen.xls
                                               @packs[no8][:swissmedic_category]
                                             else
                                               '0'
                                             end.gsub(/(\+|\s)/, '')
-            row << "%0#{DAT_LEN[:ITHE]}d" % if (no8 && @packs[no8])
+            row << "%0#{DAT_LEN[:ITHE]}d" % if (no8 && @packs[no8] && !@packs[no8][:is_tier])
                                               format_date(@packs[no8][:ith_swissmedic])
                                             else
                                               ('0' * DAT_LEN[:ITHE])

data/lib/oddb2xml/extractor.rb

@@ -204,7 +204,7 @@ module Oddb2xml
         eht     = 12   # :einheit_swissmedic
         sub     = 14   # :substance_swissmedic
         @sheet.each_with_index do |row, i|
-          next if (i== 0 or row[typ] == 'Tierarzneimittel')
+          next if (i== 0)
           no8 = extract_number(row, i_5).to_s + extract_number(row, i_3, /^\d{3}$/).to_s
           unless no8.empty?
             ean_base12 = "7680#{no8}"
@@ -216,6 +216,7 @@ module Oddb2xml
               :package_size         => row[siz].to_s,
               :einheit_swissmedic   => row[eht].to_s,
               :substance_swissmedic => row[sub].to_s,
+              :is_tier              => (row[typ] == 'Tierarzneimittel' ? true : false),
             }
           end
         end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.3.7"
+  VERSION = "1.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &15778620 !ruby/object:Gem::Requirement
+  requirement: &17599500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15778620
+  version_requirements: *17599500
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &15777540 !ruby/object:Gem::Requirement
+  requirement: &17598980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15777540
+  version_requirements: *17598980
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &15776980 !ruby/object:Gem::Requirement
+  requirement: &17598420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15776980
+  version_requirements: *17598420
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &15776260 !ruby/object:Gem::Requirement
+  requirement: &17597680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15776260
+  version_requirements: *17597680
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &15775420 !ruby/object:Gem::Requirement
+  requirement: &17596580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *15775420
+  version_requirements: *17596580
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &15774640 !ruby/object:Gem::Requirement
+  requirement: &17596100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15774640
+  version_requirements: *17596100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15773640 !ruby/object:Gem::Requirement
+  requirement: &17595560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15773640
+  version_requirements: *17595560
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &15771340 !ruby/object:Gem::Requirement
+  requirement: &17594800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15771340
+  version_requirements: *17594800
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &15769640 !ruby/object:Gem::Requirement
+  requirement: &17593260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15769640
+  version_requirements: *17593260
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &15767680 !ruby/object:Gem::Requirement
+  requirement: &17590480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *15767680
+  version_requirements: *17590480
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15764720 !ruby/object:Gem::Requirement
+  requirement: &17554860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15764720
+  version_requirements: *17554860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15760840 !ruby/object:Gem::Requirement
+  requirement: &17553900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *15760840
+  version_requirements: *17553900
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &15759960 !ruby/object:Gem::Requirement
+  requirement: &17553160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *15759960
+  version_requirements: *17553160
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: