oddb2xml 1.2.5 → 1.2.6

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.2.6 / 30.01.2013
+
+* Update to exclude 14-EAN for oddb_with_migel.dat
+* Create LIMNAMEABAG for code into limitations.xml
+* Create LIMNIV in limitation.xml
+* Add lims at parent level into limitations.xml
+* Fix typo Fr as De
+
 === 1.2.5 / 27.01.2013
 
 * Add missing line break into dat

data/bin/oddb2xml

@@ -18,7 +18,9 @@ Usage:
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
     -o O, --optional=O   Optional output. O, only 'fi' is available.
-    -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9_]
+    -i I, --include=I    Include target option for 'dat' format. only 'ean14' is available.
+                         'xml' format includes always ean14 records.
+    -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9]
                          If S is given, it is also used as prefix of filename.
     -h,   --help         Show this help message.
 EOS
@@ -32,13 +34,15 @@ opts = {
   :fi           => false,
   :tag_suffix   => nil,
   :debug        => false,
+  :ean14        => false,
 }
 
-parser.on('-a v', '--append v',     /nonpharma/)     {|v| opts[:nonpharma] = true }
-parser.on('-c v', '--compress v',   /tar\.gz|zip/)   {|v| opts[:compress_ext] = v }
-parser.on('-f v', '--format v',     /dat/)           {|v| opts[:format] = :dat }
-parser.on('-o v', '--optional v',   /fi/)            {|v| opts[:fi] = true }
-parser.on('-t v', '--tag-suffix v', /^[A-z0-9_]*$/i) {|v| opts[:tag_suffix] = v.upcase }
+parser.on('-a v', '--append v',     /^nonpharma$/)  {|v| opts[:nonpharma] = true }
+parser.on('-c v', '--compress v',   /^tar\.gz|zip$/){|v| opts[:compress_ext] = v }
+parser.on('-f v', '--format v',     /^xml|dat$/)    {|v| opts[:format] = v.intern }
+parser.on('-o v', '--optional v',   /^fi$/)         {|v| opts[:fi] = true }
+parser.on('-i v', '--include v',    /^ean14$/)      {|v| opts[:ean14] = true }
+parser.on('-t v', '--tag-suffix v', /^[A-z0-9]*$/i) {|v| opts[:tag_suffix] = v.upcase }
 #parser.on('--debug') {|v| opts[:debug] = true }
 parser.on_tail('-h', '--help') { puts help; exit }
 
@@ -54,6 +58,9 @@ end
 
 ui = Oddb2xml::Cli.new(opts)
 begin
+  if opts[:format] == :xml
+    opts[:ean14] = true # force
+  end
   #puts opts if opts[:debug]
   ui.run
 rescue Interrupt

data/lib/oddb2xml/builder.rb

@@ -20,7 +20,7 @@ module Oddb2xml
     attr_accessor :subject, :index, :items, :flags,
                   :actions,
                   :orphans, :fridges,
-                  :infos, :packs,
+                  :infos, :packs, :ean14,
                   :tag_suffix
     def initialize
       @subject    = nil
@@ -32,6 +32,7 @@ module Oddb2xml
       @actions    = []
       @orphans    = []
       @fridges    = []
+      @ean14      = true
       @tag_suffix = nil
       if block_given?
         yield self
@@ -88,7 +89,7 @@ module Oddb2xml
             @limitations += pac[:limitations]
           end
         end
-        @limitations.uniq!
+        @limitations.uniq! {|lim| lim[:code] + lim[:type] }
         @limitations.sort_by!{|lim| lim[:code] }
       end
     end
@@ -178,10 +179,12 @@ module Oddb2xml
         ) {
           @limitations.each do |lim|
             xml.LIM('DT' => '') {
-              xml.LIMCD  lim[:code]
+              xml.LIMCD  lim[:key] # swissmedic_number8 or swissmedic_number5
               xml.IT     lim[:it]
               xml.LIMTYP lim[:type]
               xml.LIMVAL lim[:value]
+              xml.LIMNAMEBAG lim[:code] # LIMCD
+              xml.LIMNIV lim[:niv]
               xml.DSCRD  lim[:desc_de]
               xml.DSCRF  lim[:desc_fr]
               xml.VDAT   lim[:vdate]
@@ -351,7 +354,7 @@ module Oddb2xml
               #xml.DOSEU
               #xml.DRGFD
               #xml.DRGFF
-              seq[:packages].values.first[:swissmedic_number] =~ /(\d{5})(\d{3})/
+              seq[:packages].values.first[:swissmedic_number8] =~ /(\d{5})(\d{3})/
               xml.ORPH @orphans.include?($1.to_s) ? true : false
               #xml.BIOPHA
               #xml.BIOSIM
@@ -462,7 +465,7 @@ module Oddb2xml
               end
               if bg_pac
                 xml.SMCAT bg_pac[:swissmedic_category] unless bg_pac[:swissmedic_category].empty?
-                xml.SMNO  bg_pac[:swissmedic_number]   unless bg_pac[:swissmedic_number].empty?
+                xml.SMNO  bg_pac[:swissmedic_number8]  unless bg_pac[:swissmedic_number8].empty?
               end
               #xml.HOSPCD
               #xml.CLINCD
@@ -477,8 +480,8 @@ module Oddb2xml
               end
               #xml.GRDFR
               if bg_pac
-                if !bg_pac[:swissmedic_number].empty? and
-                   bg_pac[:swissmedic_number].to_s =~ /(\d{5})(\d{3})/
+                if !bg_pac[:swissmedic_number8].empty? and
+                   bg_pac[:swissmedic_number8].to_s =~ /(\d{5})(\d{3})/
                   xml.COOL 1 if @fridges.include?($1.to_s)
                 end
               end
@@ -663,7 +666,7 @@ module Oddb2xml
             # prod
             @products.each do |seq|
               seq[:packages].values.each do |pac|
-                if pac[:swissmedic_number] =~ /(\d{5})(\d{3})/
+                if pac[:swissmedic_number8] =~ /(\d{5})(\d{3})/
                   number = $1.to_s
                   if i = info_index[number]
                     length += 1
@@ -740,11 +743,11 @@ module Oddb2xml
           if obj[:seq]
             pac = obj[:seq][:packages][de_pac[:pharmacode]]
           end
-          # :swissmedic_number
+          # :swissmedic_numbers
           if de_pac[:ean].length == 13
-            num =  de_pac[:ean][4,8].intern
+            num =  de_pac[:ean][4,8].intern # :swissmedic_number5
           elsif pac
-            num = pac[:swissmedic_number].intern
+            num = pac[:swissmedic_number8].intern
           end
           row << "%#{DAT_LEN[:RECA]}s"  % '11'
           row << "%#{DAT_LEN[:CMUT]}s"  % if (phar = de_pac[:pharmacode] and phar.size > 3) # does not check expiration_date
@@ -799,6 +802,7 @@ module Oddb2xml
       @articles.each do |obj|
         row = ''
         de_pac = obj[:de]
+        next if (!ean14 && de_pac[:ean].to_s.length != 13)
         # Oddb2tdat.parse_migel
         row << "%#{DAT_LEN[:RECA]}s"  % '11'
         row << "%#{DAT_LEN[:CMUT]}s"  % if (phar = de_pac[:pharmacode] and phar.size > 3)

data/lib/oddb2xml/cli.rb

@@ -162,7 +162,10 @@ module Oddb2xml
               builder.index = index
               _sbj = (type == :pharma ? :dat : :with_migel_dat)
               builder.subject = _sbj
-              output << "\n" if type == :nonpharma
+              if type == :nonpharma
+                output << "\n"
+                builder.ean14 = @options[:ean14]
+              end
               output << builder.to_dat
             end
           else

data/lib/oddb2xml/extractor.rb

@@ -22,6 +22,7 @@ module Oddb2xml
         item[:desc_fr]      = (desc = seq.at_xpath('.//DescriptionFr')) ? desc.text : ''
         item[:name_de]      = (name = seq.at_xpath('.//NameDe'))        ? name.text : ''
         item[:name_fr]      = (name = seq.at_xpath('.//NameFr'))        ? name.text : ''
+        item[:swissmedic_number5] = (num5 = seq.at_xpath('.//SwissmedicNo5')) ? num5.text : ''
         item[:org_gen_code] = (orgc = seq.at_xpath('.//OrgGenCode'))    ? orgc.text : ''
         item[:deductible]   = (ddbl = seq.at_xpath('.//FlagSB20'))      ? ddbl.text : ''
         item[:atc_code]     = (atcc = seq.at_xpath('.//AtcCode'))       ? atcc.text : ''
@@ -54,7 +55,7 @@ module Oddb2xml
             item[:packages][phar] = {
               :pharmacode          => phar,
               :swissmedic_category => (cat = pac.at_xpath('.//SwissmedicCategory')) ? cat.text : '',
-              :swissmedic_number   => (num = pac.at_xpath('.//SwissmedicNo8'))      ? num.text : '',
+              :swissmedic_number8  => (num = pac.at_xpath('.//SwissmedicNo8'))      ? num.text : '',
               :narcosis_flag       => (flg = pac.at_xpath('.//FlagNarcosis'))       ? flg.text : '',
               :prices              => {
                 :exf_price => {
@@ -69,28 +70,38 @@ module Oddb2xml
                 }
               }
             }
-            # limitation
+            # limitations
             item[:packages][phar][:limitations] = []
-            pac.xpath('.//Limitation').each do |lim|
-              limitation = {
-                :it      => item[:it_code],
-                :code    => (lic = lim.at_xpath('.//LimitationCode'))  ? lic.text : '',
-                :type    => (lit = lim.at_xpath('.//LimitationType'))  ? lit.text : '',
-                :value   => (liv = lim.at_xpath('.//LimitationValue')) ? liv.text : '',
-                :desc_de => (dsc = lim.at_xpath('.//DescriptionDe'))   ? dsc.text : '',
-                :desc_fr => (dsc = lim.at_xpath('.//DescriptionDe'))   ? dsc.text : '',
-                :vdate   => (dat = lim.at_xpath('.//ValidFromDate'))   ? dat.text : '',
-              }
-              deleted = false
-              if upto = ((thr = lim.at_xpath('.//ValidThruDate')) ? thr.text : nil) and
-                 upto =~ /\d{2}\.\d{2}\.\d{2}/
-                begin
-                  deleted = true if Date.strptime(upto, '%d.%m.%y') >= Date.today
-                rescue ArgumentError
+            limitations = Hash.new{|h,k| h[k] = [] }
+            # seq - level
+            limitations[:seq] = (lims = seq.xpath('.//Limitations/Limitation')) ? lims.to_a : nil
+            # pac - level
+            limitations[:pac] = (lims = pac.xpath('.//Limitations/Limitation')) ? lims.to_a : nil
+            limitations.each_pair do |key, lims|
+              key = (key == :pac ? item[:packages][phar][:swissmedic_number8] : item[:swissmedic_number5])
+              lims.each do |lim|
+                limitation = {
+                  :it      => item[:it_code],
+                  :key     => key,
+                  :code    => (lic = lim.at_xpath('.//LimitationCode'))   ? lic.text : '',
+                  :type    => (lit = lim.at_xpath('.//LimitationType'))   ? lit.text : '',
+                  :value   => (liv = lim.at_xpath('.//LimitationValue'))  ? liv.text : '',
+                  :niv     => (niv = lim.at_xpath('.//LimitationNiveau')) ? niv.text : '',
+                  :desc_de => (dsc = lim.at_xpath('.//DescriptionDe'))    ? dsc.text : '',
+                  :desc_fr => (dsc = lim.at_xpath('.//DescriptionFr'))    ? dsc.text : '',
+                  :vdate   => (dat = lim.at_xpath('.//ValidFromDate'))    ? dat.text : '',
+                }
+                deleted = false
+                if upto = ((thr = lim.at_xpath('.//ValidThruDate')) ? thr.text : nil) and
+                   upto =~ /\d{2}\.\d{2}\.\d{2}/
+                  begin
+                    deleted = true if Date.strptime(upto, '%d.%m.%y') >= Date.today
+                  rescue ArgumentError
+                  end
                 end
+                limitation[:del] = deleted
+                item[:packages][phar][:limitations] << limitation
               end
-              limitation[:del] = deleted
-              item[:packages][phar][:limitations] << limitation
             end
             # limitation points
             pts = pac.at_xpath('.//PointLimitations/PointLimitation/Points') # only first points
@@ -165,7 +176,7 @@ module Oddb2xml
       data = {}
       case @type
       when :packages
-        i_5,i_3 = 0,10 # :swissmedic_number
+        i_5,i_3 = 0,10 # :swissmedic_numbers
         cat     = 13   # :swissmedic_category
         ith     = 4    # :ith_swissmedic (swissmedic-diff)
         @sheet.each do |row|

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &7769140 !ruby/object:Gem::Requirement
+  requirement: &7579920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7769140
+  version_requirements: *7579920
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &7768600 !ruby/object:Gem::Requirement
+  requirement: &7579260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7768600
+  version_requirements: *7579260
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &7768000 !ruby/object:Gem::Requirement
+  requirement: &7578660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7768000
+  version_requirements: *7578660
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &7842440 !ruby/object:Gem::Requirement
+  requirement: &7578060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7842440
+  version_requirements: *7578060
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &7841360 !ruby/object:Gem::Requirement
+  requirement: &7577380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7841360
+  version_requirements: *7577380
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &7840800 !ruby/object:Gem::Requirement
+  requirement: &7576740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7840800
+  version_requirements: *7576740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7840060 !ruby/object:Gem::Requirement
+  requirement: &7576020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7840060
+  version_requirements: *7576020
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &7839060 !ruby/object:Gem::Requirement
+  requirement: &7575460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7839060
+  version_requirements: *7575460
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &7837800 !ruby/object:Gem::Requirement
+  requirement: &7574940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7837800
+  version_requirements: *7574940
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7836020 !ruby/object:Gem::Requirement
+  requirement: &7574380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *7836020
+  version_requirements: *7574380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7835320 !ruby/object:Gem::Requirement
+  requirement: &7573720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7835320
+  version_requirements: *7573720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7756700 !ruby/object:Gem::Requirement
+  requirement: &7572680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *7756700
+  version_requirements: *7572680
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7755060 !ruby/object:Gem::Requirement
+  requirement: &7570120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *7755060
+  version_requirements: *7570120
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: