diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-11-11 00:09:50 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-11-11 00:09:50 -0500 |
commit | 0b8450d62806e2e852f9b71b7a94d7830aca1c66 (patch) | |
tree | 44e4fb075e4e83169321b674c5ded7ba5fafa1c9 /lib/sisu/v3/odf.rb | |
parent | debian/changelog (3.1.3-1) (diff) | |
parent | v3: FileUtils, replace system calls (diff) |
Merge commit 'sisu_3.1.4' into debian/sid
Diffstat (limited to 'lib/sisu/v3/odf.rb')
-rw-r--r-- | lib/sisu/v3/odf.rb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb index 3bd59e81..5a095ba9 100644 --- a/lib/sisu/v3/odf.rb +++ b/lib/sisu/v3/odf.rb @@ -71,8 +71,6 @@ module SiSU_ODF class Source require 'zlib' require 'find' - require 'fileutils' - include FileUtils def initialize(opt) @opt=opt @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt) @@ -122,7 +120,7 @@ module SiSU_ODF unless @md.opt.cmd =~/[MV]/ #check maintenance flag if @env.processing_path.odt =~/od[ft]/ #p "rm -r #{@env.processing_path.odt}" if @md.opt.cmd =~/v/ - system("rm -r #{@env.processing_path.odf_pth}") + FileUtils::rm_r(@env.processing_path.odf_pth) #system("rm -r #{@env.processing_path.odt}") end end @@ -215,7 +213,7 @@ module SiSU_ODF image_source=image_src(i) pwd=Dir.pwd if image_source - cp("#{image_source}/#{i}","#{@env.processing_path.odt}/Pictures/#{i}") + FileUtils::cp("#{image_source}/#{i}","#{@env.processing_path.odt}/Pictures/#{i}") end img=if i.to_s =~/jpg|png|gif/ \ and h.to_s =~/\d/ \ @@ -523,7 +521,7 @@ module SiSU_ODF fix=[] bullet=image_src('bullet_09.png') if bullet - cp("#{bullet}/bullet_09.png","#{@env.processing_path.odt}/Pictures/.") + FileUtils::cp("#{bullet}/bullet_09.png","#{@env.processing_path.odt}/Pictures/.") end odf_metadata data.each do |dob| @@ -744,14 +742,14 @@ WOK end od.close opendoc=@md.fn[:odf] - mkdir_p(@md.file.output_path.odt.dir) unless FileTest.directory?(@md.file.output_path.odt.dir) + FileUtils::mkdir_p(@md.file.output_path.odt.dir) unless FileTest.directory?(@md.file.output_path.odt.dir) if FileTest.directory?(@env.processing_path.odt) pwd=Dir.pwd Dir.chdir(@env.processing_path.odt) system(" zip -qr #{opendoc} * - mv #{opendoc} #{@md.file.place_file.odt.dir} ") + FileUtils::mv(opendoc, @md.file.place_file.odt.dir) Dir.chdir(pwd) end end @@ -782,7 +780,7 @@ page break notes?? [you could add a note number for every object/paragraph!] - cd(@env.processing_path.odt) + FileUtils::cd(@env.processing_path.odt) structure=[] Find.find(@env.processing_path.odt) do |f| structure << puts f @@ -795,8 +793,8 @@ notes?? [you could add a note number for every object/paragraph!] zip.close end #zip -qr #{opendoc} * - mv(opendoc,"#{@env.path.output}/#{@md.fnb}/.") - cd(Dir.pwd) + FileUtils::mv(opendoc,"#{@env.path.output}/#{@md.fnb}/.") + FileUtils::cd(Dir.pwd) ● <text:span text:style-name="T6">●</text:span> #bullet dob.obj.gsub!(/^(#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]})\s*#{Mx[:gl_bullet]}/,'\1 <text:span text:style-name="T6">·</text:span> ') #bullet |