oddb2xml 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f372d02cc0e7829efac3ae2dfda2f85f031d78f6
-  data.tar.gz: a5ef791e8e1e3afc811c823b2d407bdcbf3a8e26
+  metadata.gz: c0df0b68570a06023f0f84f78759eba514f5a4b2
+  data.tar.gz: 484b181df37c6813c3c62ea6feeb429dee57aa55
 SHA512:
-  metadata.gz: a443f4fce853675f60aeddad4044a862e341597be1d3d1554f5f7dccb73ada07ed15aff04261e0adda1f86ab6154c580efd270e816d852dc1bb4173331b96678
-  data.tar.gz: bb8c5bebdb782b2f62aa976e57bc6880f1fbda0c58cea16b274fb5b634c100e25facc3a88169e2ef3138abbd383956d1073b3ca215964623c53318b432af5995
+  metadata.gz: c79037072f934cba4a8910756dacf0984dd62d4f059572b50346ab3d0475377452e9c5cafb14f8961b9a88706c9a66d42ff44ef720af16d5d2ce8c7d1f7cb844
+  data.tar.gz: 6f444c348ee935c90d54331ebcdd8736354e00ca9e7aebc5adea2e81f8733c39db1e275001539139d8f03442c57ad75d49009e649903040a00f70275589faeea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.3.7)
+    oddb2xml (2.3.8)
       archive-tar-minitar
       httpi (>= 2.4.1)
       mechanize

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.3.8 /19.04.2016
+
+* DSCRD/DSCRD for article/product must be between 3 and 120 chars long
+
 === 2.3.7 /4.04.2016
 
 * Emit version of oddb2xml which generated the XML-file

data/README.md

@@ -43,6 +43,8 @@ Consumers of the data file may use it to check whether they have to replace the
 
 ## usage
 
+HIN (http://hin.ch) creates daily the actual file. They can be downloaded from `https://download.hin.ch/download/oddb2xml`, e.g. using  `wget https://download.hin.ch/download/oddb2xml/oddb_article.xml`
+
 see `--help`.
 
 ```

data/lib/oddb2xml/builder.rb

@@ -454,6 +454,19 @@ module Oddb2xml
     end
 
     def build_product
+      def check_name(obj, lang = :de)
+        ean = obj[:ean].to_i
+        refdata = @refdata[ean]
+        if lang == :de
+          name = (refdata && refdata[:desc_de]) ? refdata[:desc_de] : obj[:sequence_name]
+        elsif lang == :fr
+          name = (refdata && refdata[:desc_fr]) ? refdata[:desc_fr] : obj[:sequence_name]
+        else
+          return false
+        end
+        return false if !name || name.empty? || name.length < 3
+        name
+      end
       prepare_substances
       prepare_products
       prepare_interactions
@@ -468,6 +481,9 @@ module Oddb2xml
         xml.PRODUCT(XML_OPTIONS) {
           list = []
           @missing.each do |obj|
+            ean = obj[:ean].to_i
+            next unless check_name(obj, :de)
+            next unless check_name(obj, :fr)
             next if /^Q/i.match(obj[:atc])
             if obj[:prodno]
               next if emitted.index(obj[:prodno])
@@ -475,16 +491,10 @@ module Oddb2xml
             end
             xml.PRD('DT' => obj[:last_change]) {
             nbr_products += 1
-            ean = obj[:ean].to_i
             xml.GTIN ean
             xml.PRODNO obj[:prodno]                                 if obj[:prodno]
-            if refdata = @refdata[ean]
-              xml.DSCRD  refdata[:desc_de]
-              xml.DSCRF  refdata[:desc_fr]
-            else
-              xml.DSCRD  obj[:sequence_name]                        if obj[:sequence_name]
-              xml.DSCRF  obj[:sequence_name]                        if obj[:sequence_name]
-            end
+            xml.DSCRD  check_name(obj, :de)
+            xml.DSCRF  check_name(obj, :fr)
             xml.ATC obj[:atc_code]                                  if obj[:atc_code] and !obj[:atc_code].empty?
             xml.IT  obj[:ith_swissmedic]                            if obj[:ith_swissmedic]
             xml.CPT
@@ -498,22 +508,19 @@ module Oddb2xml
           @products.each do |ean13, obj|
             next if /^Q/i.match(obj[:atc])
             seq = obj[:seq]
+              ean = obj[:ean]
+              next unless check_name(obj, :de)
+              next unless check_name(obj, :fr)
               xml.PRD('DT' => obj[:last_change]) do
               nbr_products += 1
-              ean = obj[:ean]
               xml.GTIN ean
               ppac = ((_ppac = @packs[ean.to_s[4..11].intern] and !_ppac[:is_tier]) ? _ppac : {})
               unless ppac
                 ppac = @packs.find{|pac| pac.ean == ean }.first
               end
               xml.PRODNO ppac[:prodno] if ppac[:prodno] and !ppac[:prodno].empty?
-              if refdata = @refdata[ean]
-                xml.DSCRD  refdata[:desc_de]
-                xml.DSCRF  refdata[:desc_fr]
-              else
-                xml.DSCRD  obj[:sequence_name]                        if obj[:sequence_name]
-                xml.DSCRF  obj[:sequence_name]                        if obj[:sequence_name]
-              end
+              xml.DSCRD  check_name(obj, :de)
+              xml.DSCRF  check_name(obj, :fr)
               #xml.BNAMD
               #xml.BNAMF
               #xml.ADNAMD

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.3.7"
+  VERSION = "2.3.8"
 end

data/oddb2xml.xsd

@@ -105,6 +105,25 @@
       <xs:attribute name="GENERATED_BY" use="required"/>
     </xs:complexType>
   </xs:element>
+
+  <xs:element name="DSCRD">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="3" />
+        <xs:maxLength value="120" />
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="DSCRF">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="3" />
+        <xs:maxLength value="120" />
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
   <xs:element name="ART">
     <xs:complexType>
       <xs:sequence>
@@ -696,8 +715,8 @@
         <xs:element ref="ns1:LIMVAL"/>
         <xs:element ref="ns1:LIMNAMEBAG"/>
         <xs:element ref="ns1:LIMNIV"/>
-        <xs:element ref="ns1:DSCRD"/>
-        <xs:element ref="ns1:DSCRF"/>
+        <xs:element name="DSCRD" type="xs:string"/>
+        <xs:element name="DSCRF" type="xs:string"/>
         <xs:element ref="ns1:VDAT"/>
       </xs:sequence>
       <xs:attribute name="DT" use="required"/>
@@ -754,8 +773,8 @@
         <xs:element ref="ns1:LIMVALMD"/>
         <xs:element ref="ns1:LIMNAMEBAGMD"/>
         <xs:element ref="ns1:LIMNIVMD"/>
-        <xs:element ref="ns1:DSCRDMD"/>
-        <xs:element ref="ns1:DSCRFMD"/>
+        <xs:element name="DSCRDMD" type="xs:string"/>
+        <xs:element name="DSCRFMD" type="xs:string"/>
         <xs:element ref="ns1:VDATMD"/>
       </xs:sequence>
       <xs:attribute name="DT" use="required"/>
@@ -1040,8 +1059,6 @@
       </xs:restriction>
     </xs:simpleType>
   </xs:element>
-  <xs:element name="DSCRD" type="xs:string"/>
-  <xs:element name="DSCRF" type="xs:string"/>
   <xs:element name="IT" type="xs:string"/>
   <xs:element name="SUBNO" type="xs:integer"/>
   <xs:element name="QTY" type="xs:string"/>

data/spec/builder_spec.rb

@@ -310,7 +310,7 @@ def check_validation_via_xsd
         if error.message
           puts "Failed validating #{file} with #{File.size(file)} bytes using XSD from #{@oddb2xml_xsd}"
         end
-        expect(error.message).to be_nil
+        expect(error.message).to be_nil, "expected #{error.message} to be nil\nfor #{file} content \n#{File.read(file)}"
     end
   }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip