From 5af7a5e47fff51efd7602bc0f240e64cd6f33b95 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 6 May 2012 23:48:53 -0400 Subject: v3: rescue & error warnings, some touched --- lib/sisu/v3/html.rb | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'lib/sisu/v3/html.rb') diff --git a/lib/sisu/v3/html.rb b/lib/sisu/v3/html.rb index fee51f2c..937ae0d0 100644 --- a/lib/sisu/v3/html.rb +++ b/lib/sisu/v3/html.rb @@ -109,7 +109,10 @@ module SiSU_HTML scr=SiSU_HTML::Source::Scroll.new(@md,data,scr_endnotes).songsheet scroll=SiSU_HTML::Source::ScrollOutput.new(scr_toc,scr[:body],scr[:metadata],scr[:owner_details],scr[:tails],@md).publish SiSU_HTML::Source::Output.new(scroll,@md).scroll - rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error + rescue + SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do + __LINE__.to_s + ':' + __FILE__ + end ensure unless @opt.cmd =~/[MV]/ #check maintenance flag texfiles=Dir["#{@env.processing_path.tune}/#{@opt.fns}*"] @@ -257,7 +260,10 @@ module SiSU_HTML @@toc[:seg] << toc[:seg] if toc[:seg] @@toc[:seg_mini] << toc[:seg_mini] if toc[:seg_mini] @@toc[:scr] << toc[:scr] if toc[:scr] - rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error + rescue + SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do + __LINE__.to_s + ':' + __FILE__ + end end end end @@ -626,8 +632,12 @@ WOK @filename_html_scroll.puts para,"\n" end end - rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error - ensure; @filename_html_scroll.close + rescue + SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do + __LINE__.to_s + ':' + __FILE__ + end + ensure + @filename_html_scroll.close end end def segtoc @@ -642,7 +652,10 @@ WOK @filename_html_segtoc.puts para,"\n" end end - rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error + rescue + SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do + __LINE__.to_s + ':' + __FILE__ + end ensure @filename_html_segtoc.close pwd_set=Dir.pwd -- cgit v1.2.3