oddb2xml 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.3.4 / 06.02.2013
+
+* Remove ORPH tag if value is false
+* Fix a bug for extract of SwissmedicNumber
+* Change priority of limitation ID key
+* Update unique key of limitation entries
+
 === 1.3.3 / 05.02.2013
 
 * Add spec example for downloading of Packungen.xls

data/lib/oddb2xml/builder.rb

@@ -116,8 +116,8 @@ module Oddb2xml
           end
         end
         # ID is no longer fixed TAG (swissmedicNo8, swissmedicNo5, pharmacode)
-        # limitation.xml needs all duplicate entries for this keys.
-        #@limitations.uniq! {|lim| lim[:] lim[:code] + lim[:type] }
+        # limitation.xml needs all duplicate entries by this keys.
+        @limitations.uniq! {|lim| lim[:id] + lim[:type] }
         @limitations.sort_by!{|lim| lim[:code] }
       end
     end
@@ -411,7 +411,9 @@ module Oddb2xml
                 #xml.DRGFD
                 #xml.DRGFF
                 pac[:swissmedic_number8] =~ /(\d{5})(\d{3})/
-                xml.ORPH @orphans.include?($1.to_s) ? true : false
+                if @orphans.include?($1.to_s)
+                  xml.ORPH true
+                end
                 #xml.BIOPHA
                 #xml.BIOSIM
                 #xml.BFS

data/lib/oddb2xml/cli.rb

@@ -145,7 +145,10 @@ module Oddb2xml
         Thread.new do
           downloader = SwissmedicDownloader.new(type)
           bin = downloader.download
-          self.instance_variable_set("@#{type.to_s}", SwissmedicExtractor.new(bin, type).to_arry)
+          self.instance_variable_set(
+            "@#{type.to_s}".intern,
+            SwissmedicExtractor.new(bin, type).to_arry
+          )
         end
       when :interaction
         Thread.new do

data/lib/oddb2xml/extractor.rb

@@ -83,19 +83,16 @@ module Oddb2xml
               key = ''
               id  = ''
               case lim_key
+              when :seq, :itc
+                key = :swissmedic_number5
+                id  = item[key].to_s
               when :pac
                 key = :swissmedic_number8
                 id  = item[:packages][phar][key].to_s
-              when :seq
-                key = :swissmedic_number5
-                id  = item[key].to_s
-              when :itc
-                key = :pharmacode
-                id  = phar
               end
               if id.empty? or id == '0'
                 key = :pharmacode
-                id  = phar .to_s
+                id  = phar.to_s
               end
               lims.each do |lim|
                 limitation = {
@@ -178,14 +175,14 @@ module Oddb2xml
         i = 1
         @sheet.each do |row|
           if number = extract_number(row, i)
-            data << number
+            data << number.to_s
           end
         end
       when :fridges
         i,c = 1,7
         @sheet.each do |row|
           if number = extract_number(row, i) and row[c] and row[c].to_s == 'x'
-            data << row[i].to_i.to_s
+            data << row[i].to_s
           end
         end
       end
@@ -213,7 +210,10 @@ module Oddb2xml
     private
     def extract_number(row, i, ptrn=/^\d{5}$/)
       begin
-        if (row[i] and number = row[i].to_s.gsub(/[^0-9]/,'') and number =~ ptrn)
+        return nil unless row[i]
+        number = row[i].to_i.to_s.gsub(/[^0-9]/, '')
+        number = number.rjust(5, '0') if ptrn == /^\d{5}$/
+        if number =~ ptrn
           return number
         else
           nil

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &7463900 !ruby/object:Gem::Requirement
+  requirement: &16544160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7463900
+  version_requirements: *16544160
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &7463260 !ruby/object:Gem::Requirement
+  requirement: &16543540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7463260
+  version_requirements: *16543540
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &7462720 !ruby/object:Gem::Requirement
+  requirement: &16542680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7462720
+  version_requirements: *16542680
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &7461920 !ruby/object:Gem::Requirement
+  requirement: &16541820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7461920
+  version_requirements: *16541820
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &7461240 !ruby/object:Gem::Requirement
+  requirement: &16541100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7461240
+  version_requirements: *16541100
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &7460680 !ruby/object:Gem::Requirement
+  requirement: &16540340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7460680
+  version_requirements: *16540340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7459980 !ruby/object:Gem::Requirement
+  requirement: &16539380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7459980
+  version_requirements: *16539380
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &7459340 !ruby/object:Gem::Requirement
+  requirement: &16538660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7459340
+  version_requirements: *16538660
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &7458660 !ruby/object:Gem::Requirement
+  requirement: &16537280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7458660
+  version_requirements: *16537280
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7457740 !ruby/object:Gem::Requirement
+  requirement: &16536600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *7457740
+  version_requirements: *16536600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7456780 !ruby/object:Gem::Requirement
+  requirement: &16536040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7456780
+  version_requirements: *16536040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7456080 !ruby/object:Gem::Requirement
+  requirement: &16535280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *7456080
+  version_requirements: *16535280
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7455140 !ruby/object:Gem::Requirement
+  requirement: &16534720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *7455140
+  version_requirements: *16534720
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: