oddb2xml 1.8.4 → 1.8.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (1.8.4)
+    oddb2xml (1.8.5)
       archive-tar-minitar (~> 0.5.2)
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.8.5 / 04.06.2014
+
+* Added element REF_DATA when generating oddb_article.xml.
+
 === 1.8.4 / 21.05.2014
 
 * Don't emit "ad us vet" or marked in Packungen.xls as "Tierarzneimittel"

data/lib/oddb2xml/builder.rb

@@ -337,9 +337,6 @@ module Oddb2xml
       end
       _builder.to_xml
     end
-    def xml_and_comment(xml, *args, &block)
-      $stderr.puts "xml_and_comment #{args[0]}"
-    end
     def build_interaction
       prepare_interactions
       prepare_codes
@@ -612,9 +609,10 @@ module Oddb2xml
               if !@prices.empty? && ean && @prices[ean]
                 price = @prices[ean] # zurrose
               end
-                xml.ART('DT' => '') {
-                                    xml.PHAR  de_idx[:pharmacode] unless de_idx[:pharmacode].empty?
-                                                                                                           #xml.GRPCD
+              xml.ART('DT' => '') {
+                xml.REF_DATA (de_idx[:refdata] || @migel[pharma_code]) ? '1' : '0'
+                xml.PHAR  de_idx[:pharmacode] unless de_idx[:pharmacode].empty?
+                #xml.GRPCD
                 #xml.CDS01
                 #xml.CDS02
                 if ppac

data/lib/oddb2xml/extractor.rb

@@ -49,6 +49,7 @@ module Oddb2xml
       result = PreparationsEntry.parse(@xml.sub(Strip_For_Sax_Machine, ''), :lazy => true)
       result.Preparations.Preparation.each do |seq|
         item = {}
+        item[:refdata]      = true
         item[:product_key]  = seq.ProductCommercial
         item[:desc_de]      = (desc = seq.DescriptionDe) ? desc : ''
         item[:desc_fr]      = (desc = seq.DescriptionFr) ? desc : ''
@@ -188,6 +189,7 @@ module Oddb2xml
       items = result.PHARMA.ITEM
       items.each do |pac|
         item = {}
+        item[:refdata]         = true
         item[:_type]           = @type.downcase.intern
         item[:ean]             = (gtin = pac.GTIN)   ? gtin: ''
         item[:pharmacode]      = (phar = pac.PHAR)   ? phar: ''
@@ -333,6 +335,7 @@ module Oddb2xml
         next if i.zero?
         phar = correct_code(row[1].to_s.gsub(/[^0-9]/, ''), 7)
         data[phar] = {
+          :refdata         => true,
           :ean             => row[0].to_i.to_s,
           :pharmacode      => phar,
           :desc_de         => row[3],
@@ -355,6 +358,7 @@ module Oddb2xml
         lang = pac.lang.to_s
         next unless lang =~ /de|fr/
         item = {}
+        item[:refdata] = true,
         item[:name]  = (name = pac.title) ? name : ''
         item[:owner] = (ownr = pac.authHolder) ? ownr : ''
         if content = /cdata/.match(pac.content)
@@ -500,9 +504,6 @@ module Oddb2xml
           :pub_price => sprintf("%.2f", line[66,6].gsub(/(\d{2})$/, '.\1').to_f),
           :type => :nonpharma,
         }
-        if /5366964/.match(ean13) then
-          Oddb2xml.log "found 5366964 data is now #{data[ean13].inspect}"
-        end
         @@zur_rose_items += 1
       end if @io
       data

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.8.4"
+  VERSION = "1.8.5"
 end

data/oddb2xml.xsd

@@ -42,6 +42,7 @@
       PEXF  Price Ex-Factory (exkl. VAT):  Taken from the ZurRose.dat characters 60..65
       PPUB  Public Price (inkl. VAT):      Taken from the ZurRose.dat characters 66..71
       SLOPLUS Selbsbehalt/deductilbe, where 1 =>  20%, 2 => 10%, '' => not known
+      REF_DATA 1 in oddb_article if coming from a refdata source (migel, bag, swissmedic), else 0
 
       FIRST import all data from swissINDEX
       * GTIN
@@ -94,6 +95,14 @@
   <xs:element name="ART">
     <xs:complexType>
       <xs:sequence>
+        <xs:element name="REF_DATA">
+          <xs:simpleType>
+            <xs:restriction base="xs:byte">
+              <xs:enumeration value="1" />
+              <xs:enumeration value="0" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
         <xs:element ref="ns1:PHAR"/>
         <xs:element minOccurs="0" ref="ns1:SMCAT"/>
         <xs:element minOccurs="0" ref="ns1:SMNO"/>

data/spec/builder_spec.rb

@@ -31,7 +31,7 @@ def check_validation_via_xsd
 end
 
 describe Oddb2xml::Builder do
-  NrExtendedArticles = 71
+  NrExtendedArticles = 70
   NrPharmaAndNonPharmaArticles = 61
   NrPharmaArticles = 4
   include ServerMockHelper
@@ -45,7 +45,6 @@ describe Oddb2xml::Builder do
   after(:each) do
     Dir.chdir @savedDir if @savedDir and File.directory?(@savedDir)
   end
-
   context 'XSD-generation: ' do
     let(:cli) do
         opts = {}
@@ -140,7 +139,6 @@ describe Oddb2xml::Builder do
     end
     it "pending should match EAN of Desitin. returns 0 at the moment" 
   end
-
   context 'when option -e is given' do
     let(:cli) do
       opts = {
@@ -153,6 +151,30 @@ describe Oddb2xml::Builder do
       Oddb2xml::Cli.new(opts)
     end
 
+    def checkItemForRefdata(doc, pharmacode, isRefdata)
+      article = XPath.match( doc, "//ART[PHAR=#{pharmacode.to_s}]").first
+      name =  article.elements['DSCRD'].text
+      refdata =  article.elements['REF_DATA'].text
+      smno    =  article.elements['SMNO'] ? article.elements['SMNO'].text : 'nil'
+      puts "checking doc for pharmacode #{pharmacode} isRefdata #{isRefdata} == #{refdata}. SMNO: #{smno} #{name}" if $VERBOSE
+      article.elements['REF_DATA'].text.should == isRefdata.to_s
+    end
+
+    it 'should generate the flag non-refdata' do
+      res = buildr_capture(:stdout){ cli.run }
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      puts @article_xml
+      File.exists?(@article_xml).should be_true
+      FileUtils.cp(@article_xml, '/opt/src/oddb2xml/tst.xml', :verbose => true)
+      article_xml = IO.read(@article_xml)
+      doc = REXML::Document.new File.new(@article_xml)
+      XPath.match( doc, "//REF_DATA" ).size.should > 0
+      checkItemForRefdata(doc, "1699947", 1) # 3TC Filmtabl 150 mg SMNO 53662013 IKSNR 53‘662, 53‘663
+      checkItemForRefdata(doc, "0028470", 0) # Complamin
+      checkItemForRefdata(doc, "3036984", 1) # NovoPen 4 Injektionsgerät blue In NonPharma (a MiGel product)
+      checkItemForRefdata(doc, "5366964", 1) # 1-DAY ACUVUE moist jour
+    end
+
     it 'should pass validating via oddb2xml.xsd' do
       check_validation_via_xsd
     end

data/spec/data/zurrose_transfer.dat

@@ -1,7 +1,6 @@
 1122465312ZYVOXID Filmtabl 600 mg 10 Stk                    096114108275100A080190076805555800542
 1120020209ERYTRHOCIN I.V. Trockensub Fl 1g                  001518002010300B080160000000000000002
 1120020244FERRO-GRADUMET Depottabl 30 Stk                   000895001090300C060710076803164401152
-1120020273KENDURAL Depottabl 30 Stk                         000492000840100C060710076803536601632
 1130020646SELSUN Shampoo Susp 60 ml                         000911001650300D100400076801723304142
 1120020652SELSUN Shampoo Susp 120 ml                        001576002520300D100400076801723306812
 1130021806EAU PRECIEUSE D?pensier L?s 375 ml                001220001870300D100600000000000000002
@@ -14,3 +13,5 @@
 1122871443CANIPHEDRIN Tabl 20 mg ad us vet. 500 Stk         004872006910400C000000000000000000002
 1122871466CANIPHEDRIN Tabl 50 mg ad us vet. 100 Stk         001424001750400C000000076804706604282
 1122871472CANIPHEDRIN Tabl 50 mg ad us vet. 500 Stk         005443007580400C000000000000000000002
+1132867163TOTALIN Plv ad us. vet. 5 kg                      000535000900400C000000000000000000002
+1138110429Forthyron 400 mcg 50 Tabl (vet)                   0081120015800000000000000000000000002

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip