diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-05-06 23:57:48 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-05-06 23:57:48 -0400 |
commit | e3e9d55838d36fe07116c5a78fb1a1e5ff38f69b (patch) | |
tree | f99176d021ff9a42c9b6ec9bf6e68ebfc4ff30c1 /lib/sisu/v3/urls.rb | |
parent | debian/changelog (3.2.6-1) (diff) | |
parent | v3: hub, options, fixes: dbi: pgsql, sqlite (diff) |
Merge tag 'sisu_3.2.7' into debian/sid
Diffstat (limited to 'lib/sisu/v3/urls.rb')
-rw-r--r-- | lib/sisu/v3/urls.rb | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index ddb62fa7..d68334e2 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -69,7 +69,10 @@ module SiSU_Urls def read begin SiSU_Urls::OutputUrls.new(@opt).songsheet if @opt.fnb - rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd).error + rescue + SiSU_Errors::InfoError.new($!,$@,@opt.cmd).error do + __LINE__.to_s + ':' + __FILE__ + end ensure end end @@ -123,7 +126,10 @@ module SiSU_Urls def songsheet begin @opt.cmd=~/U/ ? urls_all : (urls_select unless @opt.cmd=~/q/) - 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 end end @@ -159,14 +165,14 @@ module SiSU_Urls def concordance(x) SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}").result end - def qrcode(x) - SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").result - end def manifest(x) SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").result end self end + def qrcode(x) + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").result + end def odt(x) SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.odf_viewer} file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}").result end |