oddb2xml 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 952fe0868841bf075f3db7cd128326004b2ab2bf
-  data.tar.gz: c026575530d35d1ef75ff9b3ac4688f647d07427
+  metadata.gz: 448b5c708931ad04ad83dc39b7faaaca6103102e
+  data.tar.gz: cdba955c266fb2039cdb2ae7d06e94593e61ff16
 SHA512:
-  metadata.gz: e4baa838d2b817cfd994882092585e768a4375f82e3bb4843d083ade252666f939628129fa4bfecd709c36f63e81168dd2f996c5dd1f2cae6fbacb05e578a37e
-  data.tar.gz: c839a38f2739a18c515d5b90b7c64c9dd7f8dff06c17ea0a549a106dbc95faded479ae986bed4575c3780d0492f420b18c99ff568057e99e273454da70bcbf85
+  metadata.gz: 384d55410772fbd9f675162865ca257f0f2422aaed8a29b255ee190840b79eddc600382628f584a136b4600e047a46d88fd80d1547fdbee7821b04c4e0f7c09f
+  data.tar.gz: 8da57d452ec882381cc551044610e0eaea28cd7697d48f9888a07370946f0695c4e251d24d8b33319a3024f57d40aba63bfe8da5e8e5cf091522d049cda733ad

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.4.6 / 25.10.2017
+
+* PHAR is optional in oddb2xml.xsd
+* Minimal length of DSCRD is 3. Emit BC/EAN 0 as required by XSD
+
 === 2.4.5 / 25.10.2017
 
 * Fix parsing shire products

data/lib/oddb2xml/builder.rb

@@ -798,12 +798,14 @@ module Oddb2xml
           Oddb2xml.log "build_article #{idx} of #{@articles.size} articles" if idx % 500 == 0
             item = @items[obj[:ean]]
             pac,no8 = nil,obj[:ean].to_s[4..11] # BAG-XML(SL/LS)
-            pack_info = nil
+              pack_info = nil
             pack_info = @packs[no8.intern] if no8 # info from Packungen.xlsx from swissmedic_info
             ppac = nil                        # Packungen
             ean = obj[:ean]
             next if pack_info and /Tierarzneimittel/.match(pack_info[:list_code])
             next if obj[:desc_de] and /ad us vet/i.match(obj[:desc_de])
+            next if obj[:desc_de] and obj[:desc_de].length < 3
+            next if obj[:desc_fr] and obj[:desc_fr].length < 3
             pharma_code = obj[:pharmacode]
             ean = 0 if sprintf('%013d', ean).match(/^000000/)
             if obj[:seq]
@@ -822,7 +824,15 @@ module Oddb2xml
             xml.ART('DT' => obj[:last_change] ? obj[:last_change] : '') do
               nbr_records += 1
               xml.REF_DATA (obj[:refdata] || @migel[pharma_code]) ? '1' : '0'
-              xml.PHAR  sprintf('%07d', obj[:pharmacode]) if obj[:pharmacode]
+              if obj[:pharmacode]
+                xml.PHAR  sprintf('%07d', obj[:pharmacode])
+              elsif ean > 0
+                xml.PHAR  ean
+              else
+                @@counter_pseudo_ean ||= 0
+                @@counter_pseudo_ean += 1
+                xml.PHAR  sprintf('9999%07d', @@counter_pseudo_ean) # here we must add a pharmacode or validating will fail
+              end
               #xml.GRPCD
               #xml.CDS01
               #xml.CDS02
@@ -923,7 +933,7 @@ module Oddb2xml
                 xml.BC     /^9999|^0000|^0$/.match(ean.to_s) ? 0 : sprintf('%013d', ean)
                 xml.BCSTAT 'A' # P is alternative
                 #xml.PHAR2
-              } if ean && ean > 0
+              } if ean
               #xml.ARTCH {
                 #xml.PHAR2
                 #xml.CHTYPE

data/lib/oddb2xml/extractor.rb

@@ -167,6 +167,7 @@ module Oddb2xml
           pts = pac.PointLimitations.PointLimitation.first # only first points
           item[:packages][ean][:limitation_points] = pts ? pts.Points : ''
           data[ean] = item
+          puts item if /NaCl Bichsel/.match(item[:name_de]) && ean == 7680298002271
         end
       end
       data

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.4.5"
+  VERSION = "2.4.6"
 end

data/oddb2xml.xsd

@@ -135,7 +135,7 @@
             </xs:restriction>
           </xs:simpleType>
         </xs:element>
-        <xs:element ref="ns1:PHAR"/>
+        <xs:element minOccurs="0" maxOccurs="1" ref="ns1:PHAR"/>
         <xs:element minOccurs="0" ref="ns1:SMCAT"/>
         <xs:element minOccurs="0" name="GEN_PRODUCTION" type="xs:string" />
         <xs:element minOccurs="0" name="INSULIN_CATEGORY" type="xs:string" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger