oddb2xml 1.4.9 → 1.5.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.5.0 / 08.06.2013
+
+* Fix NINCD and NonPharma products report
+
 === 1.4.9 / 07.06.2013
 
 * Update NINCD for oddb_article.xml

data/lib/oddb2xml/builder.rb

@@ -665,12 +665,14 @@ module Oddb2xml
                 #xml.ARTLIM {
                 #  xml.LIMCD
                 #}
+                seq = @items[de_idx[:pharmacode]]
                 nincd = if @lppvs[de_idx[:ean]] # LPPV
                   20
-                elsif de_idx[:migel] # MiGel
-                  13
-                elsif no8 # BAG-XML (SL/LS)
+                elsif seq # BAG-XML (SL/LS)
                   10
+                elsif (de_idx[:migel] or # MiGel (xls)
+                       de_idx[:_type] == :nonpharma) # MiGel (swissindex)
+                  13
                 else
                   nil
                 end

data/lib/oddb2xml/cli.rb

@@ -289,10 +289,16 @@ module Oddb2xml
         LANGUAGES.each do |lang|
           lines << lang
           types.each do |type|
-            key = (type == :nonpharma ? 'NonPharma' : 'Pharma')
             if @index[lang][type]
-              lines << sprintf(
-                "\t#{key} products: %i", @index[lang][type].values.length)
+              indices = @index[lang][type].values.flatten.length
+              if type == :nonpharma
+                migel_xls  = @migel.values.compact.select{|m| !m[:pharmacode].empty? }.map{|m| m[:pharmacode] }
+                nonpharmas = @index[lang][type].keys
+                indices += (migel_xls - nonpharmas).length # ignore duplicates, null
+                lines << sprintf("\tNonPharma products: %i", indices)
+              else
+                lines << sprintf("\tPharma products: %i", indices)
+              end
             end
           end
         end

data/lib/oddb2xml/extractor.rb

@@ -161,6 +161,7 @@ module Oddb2xml
       doc.remove_namespaces!
       doc.xpath("//Envelope/Body/#{@type}/ITEM").each do |pac|
         item = {}
+        item[:_type]           = @type.downcase.intern
         item[:ean]             = (gtin = pac.at_xpath('.//GTIN'))   ? gtin.text : ''
         item[:pharmacode]      = (phar = pac.at_xpath('.//PHAR'))   ? phar.text : ''
         item[:status]          = (stat = pac.at_xpath('.//STATUS')) ? stat.text : ''

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.4.9"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors: