oddb2xml 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eecda0ca903018c3f2e274967e6c77067756ddd
-  data.tar.gz: d3aefcd4c33172df3b8cdb6162bc7f65bc7afe1a
+  metadata.gz: 01fd7337753234518adea6438bb4d82670b5cb37
+  data.tar.gz: 8ee70f060cd40e4503b45989527336f07c8a9dfe
 SHA512:
-  metadata.gz: 860d1342fbe204a254de1098775d57473f71412f77afdc7bf1cc396c013eace17c9d4153fa9cae194b4045390dc69ce083b9fa486bce5ffcef41ab21a22441c6
-  data.tar.gz: 347b449c21ebc17c934519e256b16f847c2ff199fadcfe9158e6634e30d44b63ddcc13e63f8bc9f86af4b58bd9d6bd113e23fecd8847dde3931a28629676291c
+  metadata.gz: 73a517563d9e338e2d0781ee13965596aaf8f559cc0b049d9a325d51c4186ee637f7b08cf4c876922488169184bf27a15a0c481072038e59e1f8aaafb0a41161
+  data.tar.gz: 01a5e728ca3be8f21d6ec0d2546b23bd9551860494019f0abf9610373cceb526eac1e4860bcae79f7cba526fe6c2fb7d28d47ee5599c3ee89502dc46ee0367c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (1.9.5)
+    oddb2xml (1.9.6)
       archive-tar-minitar (~> 0.5.2)
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)
@@ -56,7 +56,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.0.0)
+    pry-byebug (3.0.1)
       byebug (~> 3.4)
       pry (~> 0.10)
     rack (1.6.0)

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.9.6 /18.02.2015
+
+* Add all products defined in Packungen.xlsx from SwissMedic to oddb_products.xml
+
 === 1.9.5 /16.02.2015
 
 * Option --calc produces oddb_calc.xml with field SELLING_UNITS

data/lib/oddb2xml/builder.rb

@@ -437,18 +437,61 @@ module Oddb2xml
       end
       _builder.to_xml
     end
+    def add_missing_products_from_swissmedic
+      Oddb2xml.log "build_product add_missing_products_from_swissmedic. Starting"
+      ean13_to_product = {}
+      @products.each{
+        |obj|
+        ean13_to_product[obj[:ean].to_s] = obj
+      }
+      ausgabe = File.open(File.join(WorkDir, 'missing_in_refdata.txt'), 'w+')
+      size_old = ean13_to_product.size
+      @missing = []
+      Oddb2xml.log "build_product add_missing_products_from_swissmedic. Imported #{size_old} ean13_to_product from @products. Checking #{@packs.size} @packs"
+      @packs.each_with_index {
+        |de_idx, i|
+          next if ean13_to_product[de_idx[1][:ean]]
+          list_code = de_idx[1][:list_code]
+          next if list_code and /Tierarzneimittel/.match(list_code)
+          ean13_to_product[de_idx[1][:ean].to_s] = de_idx[1]
+          @missing << de_idx[1]
+          ausgabe.puts "#{de_idx[1][:ean]},#{de_idx[1][:sequence_name]}"
+      }
+      corrected_size = ean13_to_product.size
+      Oddb2xml.log "build_product add_missing_products_from_swissmedic. Added #{(corrected_size - size_old)} corrected_size #{corrected_size} size_old #{size_old} ean13_to_product."
+    end
+
     def build_product
       prepare_substances
       prepare_products
       prepare_interactions
       prepare_codes
-      Oddb2xml.log "build_product #{@products.size} products"
+      add_missing_products_from_swissmedic
+      Oddb2xml.log "build_product #{@products.size+@missing.size} products"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
         xml.PRODUCT(XML_OPTIONS) {
           list = []
           length = 0
+          @missing.each do |obj|
+            next if /^Q/i.match(obj[:atc])
+            length += 1
+            xml.PRD('DT' => '') {
+            ean = obj[:ean].to_s
+            xml.GTIN ean
+            xml.PRODNO obj[:prodno]                                 if obj[:prodno] and obj[:prodno].empty?
+            xml.DSCRD  obj[:sequence_name]                          if obj[:sequence_name]
+            xml.DSCRF  obj[:sequence_name]                          if obj[:sequence_name]
+            xml.ATC obj[:atc_code]                                  if obj[:atc_code]
+            xml.IT  obj[:ith_swissmedic]                            if obj[:ith_swissmedic]
+            xml.CPT
+            xml.PackGrSwissmedic      obj[:package_size]            if obj[:package_size]
+            xml.EinheitSwissmedic     obj[:einheit_swissmedic]      if obj[:einheit_swissmedic]
+            xml.SubstanceSwissmedic   obj[:substance_swissmedic]    if obj[:substance_swissmedic]
+            xml.CompositionSwissmedic obj[:composition_swissmedic]  if obj[:composition_swissmedic]
+                               }
+          end
           @products.each do |obj|
             next if /^Q/i.match(obj[:atc])
             seq = obj[:seq]
@@ -463,7 +506,6 @@ module Oddb2xml
               xml.PRODNO ppac[:prodno] if ppac[:prodno] and !ppac[:prodno].empty?
               if seq
                 %w[de fr].each do |l|
-
                   name = "name_#{l}".intern
                   desc = "desc_#{l}".intern
                   elem = "DSCR" + l[0].chr.upcase
@@ -654,7 +696,6 @@ module Oddb2xml
     def build_article
       prepare_limitations
       prepare_articles
-
       idx = 0
       Oddb2xml.log "build_article #{idx} of #{@articles.size} articles"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
@@ -669,9 +710,11 @@ module Oddb2xml
               pac,no8 = nil,de_idx[:ean][4..11] # BAG-XML(SL/LS)
               pack_info = nil
               pack_info = @packs[no8.intern] if no8 # info from Packungen.xlsx from swissmedic_info
-              next if pack_info and pack_info[:list_code].match(/Tierarzneimittel/) if no8 and no8.match(/47066/)
               ppac = nil                        # Packungen
               ean = de_idx[:ean]
+              next if pack_info and /Tierarzneimittel/.match(pack_info[:list_code])
+              next if de_idx[:desc] and /ad us vet/i.match(de_idx[:desc])
+
               pharma_code = de_idx[:pharmacode]
               ean = nil if ean.match(/^000000/)
               if obj[:seq]

data/lib/oddb2xml/util.rb

@@ -19,7 +19,7 @@ module Oddb2xml
   def Oddb2xml.log(msg)
     return unless @options[:log]
     $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}: #{msg}"
-    # $stdout.flush
+    $stdout.flush
   end
 
   def Oddb2xml.save_options(options)

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.9.5"
+  VERSION = "1.9.6"
 end

data/spec/builder_spec.rb

@@ -402,8 +402,8 @@ describe Oddb2xml::Builder do
         product_xml.should_not match(/ZYVOXID/i)
       end
       doc = REXML::Document.new File.new(product_filename)
-      XPath.match( doc, "//PRD" ).find_all{|x| true}.size.should == 4
-      XPath.match( doc, "//GTIN" ).find_all{|x| true}.size.should == 4
+      XPath.match( doc, "//PRD" ).find_all{|x| true}.size.should == 17
+      XPath.match( doc, "//GTIN" ).find_all{|x| true}.size.should == 17
       XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size.should == 1
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip