oddb2xml 1.9.3 → 1.9.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWZjMWMxOTA4NzhhZTVjYmFjOTk5Nzg4NGFkYjk0ZjkzMmFhN2IyNg==
+    Njk4OTQyNjMxODA2YTY1Yzk5MjU5ZDRkZDM2NzAwYWUyMGVkNWM4Yw==
   data.tar.gz: !binary |-
-    YjNjMTFkMjQ0YmRhNTFiMDg0ZTczNjlmYmZkN2UzYjQxMjQyYjcxNg==
+    NTU0N2NjMWViNmRlMDNjYjI5NDMzMmUwMDgyMmExZGFmN2Q0MmE3OA==
 SHA512:
   metadata.gz: !binary |-
-    NDliYjgzZWUzNGYwZGJhNjgxMTBlYTg2YzdkOTUyODlkNjQ3MGViMjFjY2Vi
-    OWRiMTU0Yjk3MDVlNDNhM2QzODk5N2E4YzM4ZDgyMmEwZjg1NmM0ZTlmZDNk
-    NDlmZTFkZTlkMWVhYjk0NjVhMjI1M2U3ZDgyZWM1OTI1ZmYwOWY=
+    YmUwZDVjYWU3NGNkN2I3ZGMzZDg1MTNiZTYxYTAwMTZkNDdhNjQ5YzdjOTYx
+    YTlmZWZjZWE4MzczN2YzMTM2MDIzYjNhMjI4MWUzNGM2M2MxMGE2ZmUzMWFh
+    NjI0NDkwMjM1MmNkYjc3N2FmZjA4OTFiOWRjNmViYzdjY2NmYTk=
   data.tar.gz: !binary |-
-    N2YyZmIzNjQ0MjQ1NzIxNTI4NzUxZDZlZmVhMzUwNjE0M2JmNTdlZDlmYTA4
-    NWY0NzU2YzM5OGRjZmU2MWQ0ZmQzYTA5YjBjZjk4MWJiNmJhOTJkZjExOThk
-    YzNkZTQ0OGNkYTY3MDRiZGE0OWNiYjJmMzZlZjU2ZmEwMTc5MDM=
+    OWFhYTNiODdiMmI2Yzk4MDA1YTRiMjg0NDUzYzZkMWI0MWM0NDVjZTQyMThk
+    YjI5NjI2ZTM5NjcwYWZkY2U3ZjA0MmFkODgyYTM1OWNkMGQzN2JlYjE0MjIz
+    MDY3NmY5NDJmOGFjMGVkZWM0ODUyMDc2ODEwOTRlMDU5YTc0NTQ=

data/Gemfile.lock

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

data/History.txt

@@ -1,7 +1,15 @@
+=== 1.9.4 /21.01.2015
+
+* Create additional field resellerpub in oddb_article.xml
+* Adapted xsd for this change
+* Adapted -h message
+
 === 1.9.3 / 19.01.2015
+
 * Fixed missing DSCRD/DSCF in oddb_product.xml because BAG-Preparation.xml ships without Pharmacode now
 
 === 1.9.2 / 19.01.2015
+
 * Niklaus did not run all necesary tests!
 * Fixed bin/oddbxml
 

data/lib/oddb2xml/builder.rb

@@ -734,18 +734,23 @@ module Oddb2xml
                   end
                 end
                 if info_zur_rose
+                  price = info_zur_rose[:price]
+                  vdat  = Time.parse(datetime).strftime("%d.%m.%Y")
                   xml.ARTPRI {
-                    xml.VDAT  Time.parse(datetime).strftime("%d.%m.%Y")
+                    xml.VDAT  vdat
                     xml.PTYP  "ZURROSE"
-                    price = info_zur_rose[:price]
-                    price = (price.to_f*(1 + (@options[:percent].to_f/100))).round_by(0.05).round(2) if @options[:percent] != nil
                     xml.PRICE price
                   }
                   xml.ARTPRI {
-                    xml.VDAT  Time.parse(datetime).strftime("%d.%m.%Y")
+                    xml.VDAT  vdat
                     xml.PTYP  "ZURROSEPUB"
                     xml.PRICE info_zur_rose[:pub_price]
                   }
+                  xml.ARTPRI {
+                    xml.VDAT  vdat
+                    xml.PTYP  "RESELLERPUB"
+                    xml.PRICE (price.to_f*(1 + (@options[:percent].to_f/100))).round_by(0.05).round(2)
+                  } if @options[:percent] != nil
                 end
                 #xml.ARTMIG {
                   #xml.VDAT
@@ -1031,19 +1036,18 @@ module Oddb2xml
             (pac ? pac[:name_de].to_s : '') +
             (idx[:additional_desc] ? idx[:additional_desc] : '')
           ).gsub(/"/, '')
-          price_doctor = pac ? format_price(pac[:prices][:exf_price][:price]).to_s : nil
-          price_public = pac ? format_price(pac[:prices][:pub_price][:price]).to_s : nil
           if @infos_zur_rose[ean]
-            price_public ||= sprintf('%06i', ((@infos_zur_rose[ean][:pub_price].to_f)*100).to_i)
-            if  @infos_zur_rose[ean][:pub_price]
-              price_doctor ||= sprintf('%06i', ((@infos_zur_rose[ean][:price].to_f)*100).to_i)  if  @infos_zur_rose[ean][:price]
-              if @options[:percent] != nil
-                price_doctor = sprintf('%06i', (price_doctor.to_f*(1 + (@options[:percent].to_f/100))).round_by(0.05).round(2))
-              end
+            price_exf = sprintf('%06i', ((@infos_zur_rose[ean][:price].to_f)*100).to_i)
+            price_public = sprintf('%06i', ((@infos_zur_rose[ean][:pub_price].to_f)*100).to_i)
+            if @options[:percent] != nil
+              price_public = sprintf('%06i', (price_exf.to_f*(1 + (@options[:percent].to_f/100))).round_by(0.05).round(2))
             end
+          elsif pac and pac[:prices]
+            price_exf     = sprintf('%06i', (pac[:prices][:exf_price][:price].to_f*100).to_i) if pac[:prices][:exf_price] and pac[:prices][:exf_price][:price]
+            price_public  = sprintf('%06i', (pac[:prices][:pub_price][:price].to_f*100).to_i) if pac[:prices][:pub_price] and pac[:prices][:pub_price][:price]
           end
           row << format_name(abez)
-          row << "%#{DAT_LEN[:PRMO]}s"  % (price_doctor ? price_doctor.to_s : ('0' * DAT_LEN[:PRMO]))
+          row << "%#{DAT_LEN[:PRMO]}s"  % (price_exf ? price_exf.to_s : ('0' * DAT_LEN[:PRMO]))
           row << "%#{DAT_LEN[:PRPU]}s"  % (price_public ? price_public.to_s : ('0' * DAT_LEN[:PRPU]))
           row << "%#{DAT_LEN[:CKZL]}s"  % if (@lppvs[ean])
                                             '2'

data/lib/oddb2xml/options.rb

@@ -19,7 +19,7 @@ module Oddb2xml
         :ean14        => false,
         :skip_download=> false,
         :log          => false,
-        :percent      => 0,
+        :percent      => nil,
       }
     end
     def Options.help
@@ -34,6 +34,10 @@ Usage:
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
     -I x, --increment=x  Increment price by x percent. Forces -f dat -p zurrose.
+    -I x, --increment=x  create additional field price_resellerpub as
+                         price_extfactory incremented by x percent (rounded to the next 0.05 francs)
+                         in oddb_article.xml. In generated zurrose_transfer.dat PRPU is set to this price
+                         Forces -f dat -p zurrose.
     -i,   --include      Include target option for ean14  for 'dat' format.
                          'xml' format includes always ean14 records.
     -o,   --option       Optional fachinfo output.

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.9.3"
+  VERSION = "1.9.4"
 end

data/oddb2xml.xsd

@@ -252,6 +252,7 @@
         <xs:enumeration value="PPUB" />
         <xs:enumeration value="ZURROSE" />
         <xs:enumeration value="ZURROSEPUB" />
+        <xs:enumeration value="RESELLERPUB" />
       </xs:restriction>
     </xs:simpleType>
   </xs:element>

data/spec/builder_spec.rb

@@ -192,10 +192,12 @@ describe Oddb2xml::Builder do
       File.exists?(product_filename).should eq true
       doc = REXML::Document.new File.new(@article_xml)
       unless /1\.8\.7/.match(RUBY_VERSION)
-        price_zur_rose = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSE']/PRICE").first.text
-        price_zur_rose.should eq '12.9'
         price_zur_rose_pub = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSEPUB']/PRICE").first.text
         price_zur_rose_pub.should eq '15.45'
+        price_reseller_pub = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='RESELLERPUB']/PRICE").first.text
+        price_reseller_pub.should eq '12.9'
+        price_zur_rose = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSE']/PRICE").first.text
+        price_zur_rose.should eq '7.18'
       end
     end
   end
@@ -218,9 +220,11 @@ describe Oddb2xml::Builder do
       doc = REXML::Document.new File.new(@article_xml)
       unless /1\.8\.7/.match(RUBY_VERSION)
         price_zur_rose = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSE']/PRICE").first.text
-        price_zur_rose.should eq '7.2'
+        price_zur_rose.should eq '7.18'
         price_zur_rose_pub = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSEPUB']/PRICE").first.text
         price_zur_rose_pub.should eq '15.45'
+        price_reseller_pub = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='RESELLERPUB']/PRICE")
+        price_reseller_pub.size.should eq 0
       end
     end
 
@@ -436,8 +440,9 @@ describe Oddb2xml::Builder do
       options.parser.parse!('-e -I 80 --skip-download'.split(' '))
       Oddb2xml::Cli.new(options.opts)
     end
-    search_path_rose = "//ART[PHAR=0023722]/ARTPRI[PTYP='ZURROSE']/PRICE"
-    search_path_pub  = "//ART[PHAR=0023722]/ARTPRI[PTYP='ZURROSEPUB']/PRICE"
+    search_path_reseller = "//ART[PHAR=0023722]/ARTPRI[PTYP='RESELLERPUB']/PRICE"
+    search_path_rose     = "//ART[PHAR=0023722]/ARTPRI[PTYP='ZURROSE']/PRICE"
+    search_path_pub      = "//ART[PHAR=0023722]/ARTPRI[PTYP='ZURROSEPUB']/PRICE"
     # sl-entries have a PPUB price
     search_path_desitin  = "//ART[SMNO='62069008']/ARTPRI[PTYP='PPUB']/PRICE"
 
@@ -455,6 +460,7 @@ describe Oddb2xml::Builder do
       smno    =  article.elements['SMNO'] ? article.elements['SMNO'].text : 'nil'
       XPath.match( doc, search_path_rose).size.should eq 1
       XPath.match( doc, search_path_rose).first.text.should eq '9.85'
+      XPath.match( doc, search_path_reseller).size.should eq 0
       price = 15.20 # This is the zurrose pub price.
       XPath.match( doc, search_path_pub).first.text.to_f.should eq price
       XPath.match( doc, search_path_desitin).first.text.should eq '27.8'
@@ -472,43 +478,52 @@ describe Oddb2xml::Builder do
       refdata =  article.elements['REF_DATA'].text
       smno    =  article.elements['SMNO'] ? article.elements['SMNO'].text : 'nil'
       XPath.match( doc, search_path_rose).size.should eq 1
-      XPath.match( doc, search_path_rose).first.text.should eq '17.75'
+      XPath.match( doc, search_path_rose).first.text.should eq '9.85'
       XPath.match( doc, search_path_pub).first.text
       XPath.match( doc, search_path_pub).first.text.should eq '15.20'
+      XPath.match( doc, search_path_reseller).size.should eq 1
+      XPath.match( doc, search_path_reseller).first.text.should eq '17.75'
+
       XPath.match( doc, search_path_desitin).first.text.should eq '27.8'
+
       # sl-entries have a PPUB price, but no ZURROSEPUB, and vice versa
       XPath.match( doc, "//ART[PHAR=0023722]/ARTPRI[PTYP='PPUB']").size.should eq 0
       XPath.match( doc, "//ART[SMNO='62069008']/ARTPRI[PTYP='ZURROSEPUB']").size.should eq 0
+      XPath.match( doc, "//ART[SMNO='62069008']/ARTPRI[PTYP='RESELLERPUB']").size.should eq 0
     end
   end
 
+  # Check IGM-Format
   def check_article(line, check_prices = false, add_80_percents=0)
-    name          = line[10..59]
-    ckzl          = line[72]
-    ciks          = line[75]
-    price_doctor  = line[60..65].to_i
-    price_public  = line[66..71].to_i
+    typ            = line[0..1]
+    name           = line[10..59]
+    ckzl           = line[72]
+    ciks           = line[75]
+    price_exf      = line[60..65].to_i
+    price_reseller = line[66..71].to_i
+    price_public   = line[66..71].to_i
+    typ.should    eq '11'
     puts "check_article: #{price_doctor} #{price_public} CKZL is #{ckzl} CIKS is #{ciks} name  #{name} " if $VERBOSE
     return unless check_prices
     if /11116999473TC/.match(line)
-      price_doctor.should eq 16455
       line[60..65].should eq '016455'
+      price_exf.should eq 16455
       ckzl.should eq '1'
       price_public.should eq 20530     # this is a SL-product. Therefore we may not have a price increase
       line[66..71].should eq '020530'  # the dat format requires leading zeroes and not point
     end
     if /1130598003SOFRADEX/.match(line)
-      price_public.should eq    1545  # this is a non  SL-product, but no price increase was requested
-      line[66..71].should eq '001545' # the dat format requires leading zeroes and not point
-
+      # 1130598003SOFRADEX Gtt Auric 8 ml                           000718001545300B120130076803169501572
       ckzl.should eq '3'
       if add_80_percents
-        price_doctor.should eq    1292  # = 1545*1.8 this is a non  SL-product. Therefore we must increase its price as requsted
-        line[60..65].should eq '001292' # dat format requires leading zeroes and not poin
+        price_reseller.should eq    1292  # = 1545*1.8 this is a non  SL-product. Therefore we must increase its price as requsted
+        line[66..71].should eq '001292' # dat format requires leading zeroes and not poin
       else
-        price_doctor.should eq     718  # this is a non  SL-product, but no price increase was requested
-        line[60..65].should eq '000718' # the dat format requires leading zeroes and not point
-      end
+        price_reseller.should eq     718  # this is a non  SL-product, but no price increase was requested
+        line[66..71].should eq '000718' # the dat format requires leading zeroes and not point
+      end if false
+      line[60..65].should eq '000718' # the dat format requires leading zeroes and not point
+      price_exf.should eq    718      # this is a non  SL-product, but no price increase was requested
     end
   end
 
@@ -541,6 +556,7 @@ describe Oddb2xml::Builder do
     end
     it 'should contain the corect prices' do
       res = buildr_capture(:stdout){ cli.run }
+      # res = cli.run
       res.should match(/products/)
       dat_filename = File.join(Oddb2xml::WorkDir, 'oddb.dat')
       File.exists?(dat_filename).should eq true

data/spec/options_spec.rb

@@ -31,7 +31,7 @@ describe Oddb2xml::Options do
     :ean14        => false,
     :skip_download=> false,
     :log          => false,
-    :percent      => 0,
+    :percent      => nil,
   }
   context 'when default_opts' do
     specify { expect(Oddb2xml::Options.default_opts).to eq  Default_opts }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip