oddb2xml 1.3.6 → 1.3.7

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.3.7 / 08.02.2013
+
+* Add more Tags to product.xml from Packungen.xls
+  - SubstanceSwissmedic
+  - PackGrSwissmedic
+  - EinheitSwissmedic
+
 === 1.3.6 / 08.02.2013
 
 * Update article SMCAT as only value from Packungen

data/lib/oddb2xml/builder.rb

@@ -148,28 +148,36 @@ module Oddb2xml
           indices.each_with_index do |index, i|
             obj = {}
             obj = {
-              :ean => index[:ean],
-              :atc => index[:atc_code],
-              # additional tags
-              :ith => '',
               :seq => @items[phar],
               :pac => nil,
               :no8 => nil,
               :de  => index,
               :fr  => @index['FR'][phar][i],
               :st  => index[:status],
+              # swissINDEX and Packungen.xls(if swissINDEX does not have EAN)
+              :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
-              obj[:ith] = obj[:pac][:it_code].to_s # first one
-              unless obj[:ean]
-                if obj[:no8] and ppac = @packs[obj[:no8].intern] # Packungen.xls
+              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
-                  obj[:ith] = ppac[:ith_swissmedic].to_s
-                  obj[:st]  = 'I'
                 end
+                obj[:ith] = ppac[:ith_swissmedic]
+                obj[:siz] = ppac[:package_size]
+                obj[:eht] = ppac[:einheit_swissmedic]
+                obj[:sub] = ppac[:substance_swissmedic]
               end
             end
             if obj[:ean][0..3] == '7680'
@@ -490,6 +498,9 @@ module Oddb2xml
                 #xml.REMD
                 #xml.REMF
               #}
+              xml.PackGrSwissmedic    obj[:siz] unless obj[:siz].empty?
+              xml.EinheitSwissmedic   obj[:eht] unless obj[:eht].empty?
+              xml.SubstanceSwissmedic obj[:sub] unless obj[:sub].empty?
             }
           end
           xml.RESULT {

data/lib/oddb2xml/extractor.rb

@@ -195,21 +195,27 @@ module Oddb2xml
       data = {}
       case @type
       when :packages
+        typ = 6 # Heilmittelcode
         i_5,i_3 = 0,10 # :swissmedic_numbers
         cat     = 13   # :swissmedic_category
         ith     = 4    # :ith_swissmedic IT-Code (swissmedic-diff)
         atc     = 5    # :atc_code
-        typ     = 6    # Heilmittelcode
+        siz     = 11   # :package_size
+        eht     = 12   # :einheit_swissmedic
+        sub     = 14   # :substance_swissmedic
         @sheet.each_with_index do |row, i|
           next if (i== 0 or row[typ] == 'Tierarzneimittel')
           no8 = extract_number(row, i_5).to_s + extract_number(row, i_3, /^\d{3}$/).to_s
           unless no8.empty?
             ean_base12 = "7680#{no8}"
             data[no8.intern] = {
-              :ean                 => (ean_base12.ljust(12, '0') + calc_checksum(ean_base12)),
-              :ith_swissmedic      => row[ith].to_s,
-              :swissmedic_category => row[cat].to_s,
-              :atc_code            => row[atc].to_s,
+              :ean                  => (ean_base12.ljust(12, '0') + calc_checksum(ean_base12)),
+              :ith_swissmedic       => row[ith].to_s,
+              :swissmedic_category  => row[cat].to_s,
+              :atc_code             => row[atc].to_s,
+              :package_size         => row[siz].to_s,
+              :einheit_swissmedic   => row[eht].to_s,
+              :substance_swissmedic => row[sub].to_s,
             }
           end
         end

data/lib/oddb2xml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &7438920 !ruby/object:Gem::Requirement
+  requirement: &15778620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7438920
+  version_requirements: *15778620
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &7438340 !ruby/object:Gem::Requirement
+  requirement: &15777540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7438340
+  version_requirements: *15777540
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &7437620 !ruby/object:Gem::Requirement
+  requirement: &15776980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7437620
+  version_requirements: *15776980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &7436920 !ruby/object:Gem::Requirement
+  requirement: &15776260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7436920
+  version_requirements: *15776260
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &7435960 !ruby/object:Gem::Requirement
+  requirement: &15775420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7435960
+  version_requirements: *15775420
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &7435040 !ruby/object:Gem::Requirement
+  requirement: &15774640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7435040
+  version_requirements: *15774640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7432740 !ruby/object:Gem::Requirement
+  requirement: &15773640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7432740
+  version_requirements: *15773640
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &7430920 !ruby/object:Gem::Requirement
+  requirement: &15771340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7430920
+  version_requirements: *15771340
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &7429180 !ruby/object:Gem::Requirement
+  requirement: &15769640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7429180
+  version_requirements: *15769640
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7425900 !ruby/object:Gem::Requirement
+  requirement: &15767680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *7425900
+  version_requirements: *15767680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7421480 !ruby/object:Gem::Requirement
+  requirement: &15764720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7421480
+  version_requirements: *15764720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7420100 !ruby/object:Gem::Requirement
+  requirement: &15760840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *7420100
+  version_requirements: *15760840
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7418960 !ruby/object:Gem::Requirement
+  requirement: &15759960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *7418960
+  version_requirements: *15759960
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: