From b1b2fe8cc3120d2a53e4c211748107ced1b1b40b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 15 May 2011 23:10:49 -0400 Subject: v3: sysenv, output_path & place_file, modified, (affects many libraries) * paths for dir, url, relative and rcp that vary with output dir structure * cope with alterative dir structures * manifest url paths, fix * dal_expand_insertions, fix * rsync, review * scp disabled --- lib/sisu/v3/concordance.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/sisu/v3/concordance.rb') diff --git a/lib/sisu/v3/concordance.rb b/lib/sisu/v3/concordance.rb index d97c7786..72031419 100644 --- a/lib/sisu/v3/concordance.rb +++ b/lib/sisu/v3/concordance.rb @@ -77,7 +77,7 @@ module SiSU_Concordance @env,@md=@particulars.env,@particulars.md loc=@env.url.output_tell unless @md.opt.cmd =~/q/ - tool=(@md.opt.cmd =~/[MVv]/) ? "#{@env.program.web_browser} #{@md.file.output_path.html_concordance}/#{@md.file.base_filename.html_concordance}" : @md.fns + tool=(@md.opt.cmd =~/[MVv]/) ? "#{@env.program.web_browser} #{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}" : @md.fns @md.opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@md.opt.cmd,"Concordance",tool).grey_title_hi \ : SiSU_Screen::Ansi.new(@md.opt.cmd,'Concordance',tool).green_title_hi @@ -202,8 +202,8 @@ WOK end def songsheet begin - mkdir_p(@file.output_path.html_concordance) unless FileTest.directory?(@file.output_path.html_concordance) - @file_concordance=File.open(@file.place_file.html_concordance,'w') + mkdir_p(@file.output_path.html_concordance.dir) unless FileTest.directory?(@file.output_path.html_concordance.dir) + @file_concordance=File.open(@file.place_file.html_concordance.dir,'w') map_para rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error ensure @@ -337,7 +337,7 @@ WOK end credits=@vz.credits_sisu @file_concordance << %{\n} # footer - SiSU_Screen::Ansi.new(@opt.cmd,@md.fns,"#{@md.file.output_path.html_concordance}/#{@md.file.base_filename.html_concordance}").flow if @md.opt.cmd =~/[MV]/ + SiSU_Screen::Ansi.new(@opt.cmd,@md.fns,"#{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}").flow if @md.opt.cmd =~/[MV]/ end end end -- cgit v1.2.3