oddb2xml 1.4.6 → 1.4.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.4.7 / 13.05.2013
+
+* Add prodno to oddb_product.xml
+
 === 1.4.6 / 24.04.2013
 
 * Update to skip ean14 as default in also oddb.dat

data/README.md

@@ -4,11 +4,11 @@
 
 creates the following xml files:
 
-* oddb_substance.xml      
-* oddb_limitation.xml              
-* oddb_interaction.xml    
-* oddb_code.xml           
-* oddb_product.xml        
+* oddb_substance.xml
+* oddb_limitation.xml
+* oddb_interaction.xml
+* oddb_code.xml
+* oddb_product.xml
 * oddb_article.xml
 * oddb_fi.xml
 * oddb_fi_product.xml
@@ -91,11 +91,11 @@ i.e.:
 
 xml files generated are:
 
-* oddb_substance.xml      
-* oddb_limitation.xml     
-* oddb_interaction.xml    
-* oddb_code.xml           
-* oddb_product.xml        
+* oddb_substance.xml
+* oddb_limitation.xml
+* oddb_interaction.xml
+* oddb_code.xml
+* oddb_product.xml
 * oddb_article.xml
 * oddb_fi.xml
 * oddb_fi_product.xml
@@ -156,30 +156,34 @@ For example, if `-t _swiss` is given then oddb2xml creates product.xml as swiss_
 <?xml version="1.0" encoding="utf-8"?>
 <PRODUCT_SWISS xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration" CREATION_DATETIME="2012-11-21T13:01:29.5903756+0900" PROD_DATE="2012-11-21T13:01:29.5903756+0900" VALID_DATE="2012-11-21T13:01:29.5903756+0900">
   <PRD_SWISS DT="">
-    <PRDNO_SWISS>1167149</PRDNO_SWISS>
-    <DSCRD_SWISS>Allergovit Artemisia Inj Susp Kombi</DSCRD_SWISS>
-    <DSCRF_SWISS>Allergovit Artemisia susp inj combi </DSCRF_SWISS>
-    <ATC_SWISS>V01AA10</ATC_SWISS>
-    <IT_SWISS>07.13.30.</IT_SWISS>
+    <GTIN_SWISS>7680353660163</GTIN_SWISS>
+    <PRODNO_SWISS>353661</PRODNO_SWISS>
+    <DSCRD_SWISS>Kendural Depottabl </DSCRD_SWISS>
+    <DSCRF_SWISS>Kendural cpr dépôt </DSCRF_SWISS>
+    <ATC_SWISS>B03AE10</ATC_SWISS>
+    <IT_SWISS>06.07.1.</IT_SWISS>
     <CPT_SWISS>
       <CPTCMP_SWISS>
         <LINE_SWISS>0</LINE_SWISS>
-        <SUBNO_SWISS>100</SUBNO_SWISS>
-        <QTY_SWISS>1000</QTY_SWISS>
-        <QTYU_SWISS>U.</QTYU_SWISS>
+        <SUBNO_SWISS>507</SUBNO_SWISS>
+        <QTY_SWISS>105</QTY_SWISS>
+        <QTYU_SWISS>mg</QTYU_SWISS>
       </CPTCMP_SWISS>
       <CPTCMP_SWISS>
         <LINE_SWISS>1</LINE_SWISS>
-        <SUBNO_SWISS>105</SUBNO_SWISS>
-        <QTY_SWISS>10000</QTY_SWISS>
-        <QTYU_SWISS>U.</QTYU_SWISS>
+        <SUBNO_SWISS>23</SUBNO_SWISS>
+        <QTY_SWISS>500</QTY_SWISS>
+        <QTYU_SWISS>mg</QTYU_SWISS>
       </CPTCMP_SWISS>
     </CPT_SWISS>
+    <PackGrSwissmedic_SWISS>30</PackGrSwissmedic_SWISS>
+    <EinheitSwissmedic_SWISS>Tablette(n)</EinheitSwissmedic_SWISS>
+    <SubstanceSwissmedic_SWISS>ferrum(II), acidum ascorbicum</SubstanceSwissmedic_SWISS>
   </PRD_SWISS>
   ...
   <RESULT_SWISS>
     <OK_ERROR_SWISS>OK</OK_ERROR_SWISS>
-    <NBR_RECORD_SWISS>5850</NBR_RECORD_SWISS>
+    <NBR_RECORD_SWISS>14336</NBR_RECORD_SWISS>
     <ERROR_CODE_SWISS/>
     <MESSAGE_SWISS/>
   </RESULT_SWISS>

data/lib/oddb2xml/builder.rb

@@ -389,6 +389,8 @@ module Oddb2xml
             length += 1
             xml.PRD('DT' => '') {
               xml.GTIN obj[:ean].to_s
+              ppac = ((_ppac = @packs[obj[:ean].to_s[4..11].intern] and !_ppac[:is_tier]) ? _ppac : {})
+              xml.PRODNO ppac[:prodno] if ppac[:prodno] and !ppac[:prodno].empty?
               if seq
                 %w[de fr].each do |l|
                   name = "name_#{l}".intern
@@ -544,9 +546,8 @@ module Oddb2xml
                 #xml.GRPCD
                 #xml.CDS01
                 #xml.CDS02
-                #xml.PRDNO
-                if ppac && ppac[:swissmedic_category]
-                  xml.SMCAT ppac[:swissmedic_category]
+                if ppac
+                  xml.SMCAT ppac[:swissmedic_category] unless ppac[:swissmedic_category].empty?
                 end
                 if no8
                   xml.SMNO no8.to_s unless no8.to_s.empty?

data/lib/oddb2xml/extractor.rb

@@ -216,13 +216,14 @@ module Oddb2xml
       case @type
       when :package
         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
-        siz     = 11   # :package_size
-        eht     = 12   # :einheit_swissmedic
-        sub     = 14   # :substance_swissmedic
+        i_5,i_3   = 0,10 # :swissmedic_numbers
+        p_5,p_1_2 = 0,1  # :prodno
+        cat       = 13   # :swissmedic_category
+        ith       = 4    # :ith_swissmedic IT-Code (swissmedic-diff)
+        atc       = 5    # :atc_code
+        siz       = 11   # :package_size
+        eht       = 12   # :einheit_swissmedic
+        sub       = 14   # :substance_swissmedic
         @sheet.each_with_index do |row, i|
           next if (i== 0)
           no8 = extract_number(row, i_5).to_s + extract_number(row, i_3, /^\d{3}$/).to_s
@@ -230,6 +231,7 @@ module Oddb2xml
             ean_base12 = "7680#{no8}"
             data[no8.intern] = {
               :ean                  => (ean_base12.ljust(12, '0') + calc_checksum(ean_base12)),
+              :prodno               => row[p_5].to_s + row[p_1_2].to_i.to_s,
               :ith_swissmedic       => row[ith].to_s,
               :swissmedic_category  => row[cat].to_s,
               :atc_code             => row[atc].to_s,

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &12823940 !ruby/object:Gem::Requirement
+  requirement: &16490580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12823940
+  version_requirements: *16490580
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &12823400 !ruby/object:Gem::Requirement
+  requirement: &16486880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12823400
+  version_requirements: *16486880
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &12822680 !ruby/object:Gem::Requirement
+  requirement: &16485740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *12822680
+  version_requirements: *16485740
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12821680 !ruby/object:Gem::Requirement
+  requirement: &16482320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12821680
+  version_requirements: *16482320
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &12820900 !ruby/object:Gem::Requirement
+  requirement: &16479200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12820900
+  version_requirements: *16479200
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &12820160 !ruby/object:Gem::Requirement
+  requirement: &16478320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12820160
+  version_requirements: *16478320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12818940 !ruby/object:Gem::Requirement
+  requirement: &16477600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12818940
+  version_requirements: *16477600
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &12818080 !ruby/object:Gem::Requirement
+  requirement: &16476920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12818080
+  version_requirements: *16476920
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &12816820 !ruby/object:Gem::Requirement
+  requirement: &16476180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *12816820
+  version_requirements: *16476180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12815860 !ruby/object:Gem::Requirement
+  requirement: &16475520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12815860
+  version_requirements: *16475520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12814700 !ruby/object:Gem::Requirement
+  requirement: &16474880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *12814700
+  version_requirements: *16474880
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &12813860 !ruby/object:Gem::Requirement
+  requirement: &16474380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *12813860
+  version_requirements: *16474380
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: