oddb2xml 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5029eb894e5fff0733694a035eb36498874dd86b
-  data.tar.gz: c3834f3d1ff71b013068706ef016e32e00237314
+  metadata.gz: b279006b7a02bc2158a4c4648cf8085558ba461c
+  data.tar.gz: 05670f47dd650124d5b09eae09189dfcb664c155
 SHA512:
-  metadata.gz: 5a4a531b9d80fa34c42703a5d65f67a410464ceb6efde1c3dc49159da64dc4a847ad3e72b4417a46fea33d51c984e027d94a91329af195ed16cd15d1fab01f30
-  data.tar.gz: 38f0930241a840af95c532cd28f7fd2cca5008a7d65d0f85f26f47936b62bb0e4caf61e0f29b624efc61cd50addb12d609b6c8d19f7cd29d7385e8569a60885d
+  metadata.gz: 0e4335f32a05b00def36dcbba9816e69f518a9e5d15af88610eff955b651ae154ada3e046ec0d3c8dd0073993b729607305869928e5e23b55d1c45bedfe33542
+  data.tar.gz: 21b5c2dfaa6b45eec587d86ced6499f67b6404d6f7c4a42dec5e264dcbb56a37a81541b56eeac6e74c9cd0346463295d2e9c3c295e3d932d184c1eb3ad1432a9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.3.5)
+    oddb2xml (2.3.6)
       archive-tar-minitar
       httpi (>= 2.4.1)
       mechanize
@@ -55,7 +55,7 @@ GEM
     multi_json (1.11.2)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.7.1)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
     ntlm-http (0.1.1)

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.3.6 /16.03.2016
+
+* Generate always a PRODNO with 7 digits (5 from ISKNR, 2 from SEQNR)
+
 === 2.3.5 /21.01.2016
 
 * Readded VDAT in oddb_article.xml for prices not from ZurRose

data/lib/oddb2xml/extractor.rb

@@ -262,7 +262,7 @@ module Oddb2xml
           next unless row and row[i_5] and row[i_3]
           next unless row[i_5].value.to_i > 0 and row[i_3].value.to_i > 0
           no8 = sprintf('%05d',row[i_5].value.to_i) + sprintf('%03d',row[i_3].value.to_i)
-          prodno = sprintf('%05d',row[i_5].value.to_i) + row[p_1_2].value.to_i.to_s
+          prodno = sprintf('%05d',row[i_5].value.to_i) + sprintf('%02d', row[p_1_2].value.to_i).to_s
           unless no8.empty?
             next if no8.to_i == 0
             ean_base12 = "7680#{no8}"

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.3.5"
+  VERSION = "2.3.6"
 end

data/oddb2xml.xsd

@@ -85,6 +85,11 @@
       * Packungsgrösse (column 'L') -> Field PackGrSwissmedic in oddb_article.xml
       * Packungseinheit(column 'L') -> Field EinheitSwissmedic in oddb_article.xml
       
+      In oddb_product.xml PRODNO must be exactly 7 digits long. For all drugs appearing in the Packungen.xlsx the
+      PRODNO is defined as IKSNR (column A Zulassungsnummer) + SEQ (column b Dosisstärkenummer) and the DSCRD is
+      taken vom refdata.
+
+
     </xs:documentation>
   </xs:annotation>
   
@@ -1015,7 +1020,13 @@
     </xs:complexType>
   </xs:element>
   <xs:element name="NAMLMD" type="xs:string"/>
-  <xs:element name="PRODNO" type="xs:integer"/>
+  <xs:element name="PRODNO">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer">
+        <xs:pattern value="\d{7}"/>
+      </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"/>

data/spec/builder_spec.rb

@@ -47,7 +47,7 @@ ARTICLE_COMMON_ELEMENTS =    [
   ['ARTICLE/ART/DRUG_INDEX', 'd'],
   ['ARTICLE/ART/INSULIN_CATEGORY', 'Insulinanalog: schnell wirkend'],
   ['ARTICLE/ART/SMNO', '16105058'],
-  ['ARTICLE/ART/PRODNO', '161051'],
+  ['ARTICLE/ART/PRODNO', '1610501'],
   ['ARTICLE/ART/VAT', '2'],
   ['ARTICLE/ART/SALECD', 'A'],
   ['ARTICLE/ART/SALECD', 'I'],
@@ -385,7 +385,7 @@ def checkArticleXml(checkERYTHROCIN = true)
   expect(desitin.elements['SMCAT'].text).to eq('B')
   expect(desitin.elements['SMNO'].text).to eq('62069008')
   expect(desitin.elements['VAT'].text).to eq('2')
-  expect(desitin.elements['PRODNO'].text).to eq('620691')
+  expect(desitin.elements['PRODNO'].text).to eq('6206901')
   expect(desitin.elements['SALECD'].text).to eq('A')
   expect(desitin.elements['CDBG'].text).to eq('N')
   expect(desitin.elements['BG'].text).to eq('N')
@@ -420,7 +420,7 @@ def checkProductXml(nbr_record = -1)
   expect(desitin.elements['ATC'].text).to eq('N03AX14')
   expect(desitin.elements['DSCRD'].text).to eq("LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk")
   expect(desitin.elements['DSCRF'].text).to eq('LEVETIRACETAM DESITIN mini cpr pel 250 mg 30 pce')
-  expect(desitin.elements['PRODNO'].text).to eq '620691'
+  expect(desitin.elements['PRODNO'].text).to eq '6206901'
   expect(desitin.elements['IT'].text).to eq '01.07.1.'
   expect(desitin.elements['PackGrSwissmedic'].text).to eq '30'
   expect(desitin.elements['EinheitSwissmedic'].text).to eq 'Tablette(n)'
@@ -790,8 +790,8 @@ if RUN_ALL
       expect(XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('5366964') }.size).to eq(1)
       expect(dscrds.size).to eq(NrExtendedArticles)
       expect(XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size).to be >= 1
-      expect(XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('002771') }.size).to eq(0)
-      expect(XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('620691') }.size).to eq(1)
+      expect(XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('0027701') }.size).to eq(0)
+      expect(XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('6206901') }.size).to eq(1)
     end
 
     it 'should load correct number of nonpharma' do

metadata

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