From bd4e38f4a8c31242caf7d7cbfd3a083a263752b8 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 21 Aug 2013 23:09:51 -0400
Subject: v4 v5: rescued error messages
---
lib/sisu/v4/composite.rb | 4 ++--
lib/sisu/v4/concordance.rb | 6 +++---
lib/sisu/v4/dal.rb | 16 ++++++++--------
lib/sisu/v4/db_drop.rb | 2 +-
lib/sisu/v4/db_import.rb | 8 ++++----
lib/sisu/v4/db_select.rb | 2 +-
lib/sisu/v4/dbi.rb | 2 +-
lib/sisu/v4/dbi_discrete.rb | 4 ++--
lib/sisu/v4/digests.rb | 2 +-
lib/sisu/v4/embedded.rb | 2 +-
lib/sisu/v4/epub.rb | 12 ++++++------
lib/sisu/v4/epub_concordance.rb | 6 +++---
lib/sisu/v4/epub_segments.rb | 2 +-
lib/sisu/v4/epub_tune.rb | 2 +-
lib/sisu/v4/errors.rb | 4 ++--
lib/sisu/v4/html.rb | 8 ++++----
lib/sisu/v4/html_scroll.rb | 2 +-
lib/sisu/v4/html_segments.rb | 2 +-
lib/sisu/v4/html_tune.rb | 2 +-
lib/sisu/v4/hub.rb | 2 +-
lib/sisu/v4/manifest.rb | 4 ++--
lib/sisu/v4/manpage.rb | 2 +-
lib/sisu/v4/odf.rb | 2 +-
lib/sisu/v4/param.rb | 4 ++--
lib/sisu/v4/particulars.rb | 22 +++++++++++-----------
lib/sisu/v4/plaintext.rb | 2 +-
lib/sisu/v4/po4a.rb | 2 +-
lib/sisu/v4/qrcode.rb | 4 ++--
lib/sisu/v4/rexml.rb | 2 +-
lib/sisu/v4/sitemaps.rb | 2 +-
lib/sisu/v4/sst_do_inline_footnotes.rb | 4 ++--
lib/sisu/v4/sst_to_s_xml_sax.rb | 4 ++--
lib/sisu/v4/texpdf.rb | 8 ++++----
lib/sisu/v4/update.rb | 2 +-
lib/sisu/v4/urls.rb | 4 ++--
lib/sisu/v4/webrick.rb | 4 ++--
lib/sisu/v4/wikispeak.rb | 2 +-
lib/sisu/v4/xhtml.rb | 4 ++--
lib/sisu/v4/xml.rb | 4 ++--
lib/sisu/v4/xml_dom.rb | 4 ++--
lib/sisu/v4/xml_fictionbook.rb | 2 +-
lib/sisu/v4/xml_scaffold.rb | 2 +-
lib/sisu/v5/composite.rb | 4 ++--
lib/sisu/v5/concordance.rb | 6 +++---
lib/sisu/v5/dal.rb | 16 ++++++++--------
lib/sisu/v5/db_drop.rb | 2 +-
lib/sisu/v5/db_import.rb | 8 ++++----
lib/sisu/v5/db_select.rb | 2 +-
lib/sisu/v5/dbi.rb | 2 +-
lib/sisu/v5/dbi_discrete.rb | 4 ++--
lib/sisu/v5/digests.rb | 2 +-
lib/sisu/v5/embedded.rb | 2 +-
lib/sisu/v5/epub.rb | 12 ++++++------
lib/sisu/v5/epub_concordance.rb | 6 +++---
lib/sisu/v5/epub_segments.rb | 2 +-
lib/sisu/v5/epub_tune.rb | 2 +-
lib/sisu/v5/errors.rb | 4 ++--
lib/sisu/v5/html.rb | 8 ++++----
lib/sisu/v5/html_scroll.rb | 2 +-
lib/sisu/v5/html_segments.rb | 2 +-
lib/sisu/v5/html_tune.rb | 2 +-
lib/sisu/v5/hub.rb | 2 +-
lib/sisu/v5/manifest.rb | 4 ++--
lib/sisu/v5/manpage.rb | 2 +-
lib/sisu/v5/odf.rb | 2 +-
lib/sisu/v5/param.rb | 4 ++--
lib/sisu/v5/particulars.rb | 22 +++++++++++-----------
lib/sisu/v5/plaintext.rb | 2 +-
lib/sisu/v5/po4a.rb | 2 +-
lib/sisu/v5/qrcode.rb | 4 ++--
lib/sisu/v5/rexml.rb | 2 +-
lib/sisu/v5/sitemaps.rb | 2 +-
lib/sisu/v5/sst_do_inline_footnotes.rb | 4 ++--
lib/sisu/v5/sst_to_s_xml_sax.rb | 4 ++--
lib/sisu/v5/texpdf.rb | 8 ++++----
lib/sisu/v5/update.rb | 2 +-
lib/sisu/v5/urls.rb | 4 ++--
lib/sisu/v5/webrick.rb | 4 ++--
lib/sisu/v5/wikispeak.rb | 2 +-
lib/sisu/v5/xhtml.rb | 4 ++--
lib/sisu/v5/xml.rb | 4 ++--
lib/sisu/v5/xml_dom.rb | 4 ++--
lib/sisu/v5/xml_fictionbook.rb | 2 +-
lib/sisu/v5/xml_scaffold.rb | 2 +-
84 files changed, 180 insertions(+), 180 deletions(-)
(limited to 'lib')
diff --git a/lib/sisu/v4/composite.rb b/lib/sisu/v4/composite.rb
index 0d0655b8..2d537f4a 100644
--- a/lib/sisu/v4/composite.rb
+++ b/lib/sisu/v4/composite.rb
@@ -103,7 +103,7 @@ module SiSU_Assemble
write(assembled)
Dir.chdir(pwd)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -220,7 +220,7 @@ module SiSU_Assemble
@fns_array=IO.readlines(@opt.fns,'')
insertions?
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/concordance.rb b/lib/sisu/v4/concordance.rb
index 567b36e0..5387dce3 100644
--- a/lib/sisu/v4/concordance.rb
+++ b/lib/sisu/v4/concordance.rb
@@ -99,7 +99,7 @@ module SiSU_Concordance
SiSU_Concordance::Source::Words.new(@particulars).songsheet
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -216,7 +216,7 @@ WOK
@alphlst=SiSU_i18n::Alphabet.new(@md.opt.lng).hash_strings
@rgx_scanlist=%r{#{Mx[:fa_italics_o]}[#{@alphlst[:l]}#{@alphlst[:u]}0-9"\s]{2,12}#{Mx[:fa_italics_c]}|#{Mx[:fa_bold_o]}[#{@alphlst[:l]}#{@alphlst[:u]}0-9"\s]{2,12}#{Mx[:fa_bold_c]}|(?:https?|file)://\S+|<\S+?>|[#{@alphlst[:l]}#{@alphlst[:u]}]+|\w+}mi
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -227,7 +227,7 @@ WOK
@file_concordance=File.open(@file.place_file.html_concordance.dir,'w')
map_para
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/dal.rb b/lib/sisu/v4/dal.rb
index e8574528..4a158fb6 100644
--- a/lib/sisu/v4/dal.rb
+++ b/lib/sisu/v4/dal.rb
@@ -123,7 +123,7 @@ module SiSU_DAL
: @opt.fns
create_dal
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@@fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@@fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -144,7 +144,7 @@ module SiSU_DAL
? read_fnc
: @@dal_array.dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -163,7 +163,7 @@ module SiSU_DAL
end
dal=(@@idx_arr[:sst].empty?) ? read_idx_sst : @@idx_arr[:sst].dup #check
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -182,7 +182,7 @@ module SiSU_DAL
end
dal=(@@idx_arr[:tex].empty?) ? read_idx_raw : @@idx_arr[:tex].dup #check
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -201,7 +201,7 @@ module SiSU_DAL
end
dal=(@@idx_arr[:html].empty?) ? read_idx_html : @@idx_arr[:html].dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -220,7 +220,7 @@ module SiSU_DAL
end
dal=(@@idx_arr[:xhtml].empty?) ? read_idx_xhtml : @@idx_arr[:xhtml].dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -239,7 +239,7 @@ module SiSU_DAL
end
dal=(@@map_arr[:nametags].empty?) ? read_map_nametags : @@map_arr[:nametags].dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -258,7 +258,7 @@ module SiSU_DAL
end
dal=(@@map_arr[:ocn_htmlseg].empty?) ? read_map_ocn_htmlseg : @@map_arr[:ocn_htmlseg].dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/db_drop.rb b/lib/sisu/v4/db_drop.rb
index 6c6b3cd0..80167822 100644
--- a/lib/sisu/v4/db_drop.rb
+++ b/lib/sisu/v4/db_drop.rb
@@ -108,7 +108,7 @@ module SiSU_DbDrop
sdb.create_table.urls
sdb_index.create_indexes
rescue
- SiSU_Errors::InfoError.new($!,$@,'-D').error do
+ SiSU_Errors::Rescued.new($!,$@,'-D').location do
__LINE__.to_s + ':' + __FILE__
end
sdb.output_dir?
diff --git a/lib/sisu/v4/db_import.rb b/lib/sisu/v4/db_import.rb
index 4f77cdb0..240efd67 100644
--- a/lib/sisu/v4/db_import.rb
+++ b/lib/sisu/v4/db_import.rb
@@ -171,7 +171,7 @@ module SiSU_DbImport
STDERR.puts "Error code: #{e.err}"
STDERR.puts "Error message: #{e.errstr}"
STDERR.puts "Error SQLSTATE: #{e.state}"
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
sqlfn="#{@env.processing_path.sql}/#{@md.fnb}.sql"
@@ -184,7 +184,7 @@ module SiSU_DbImport
puts "#{__FILE__}:#{__LINE__}"
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
sqlfn="#{@env.processing_path.sql}/#{@md.fnb}.sql"
@@ -569,7 +569,7 @@ module SiSU_DbImport
end
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -702,7 +702,7 @@ module SiSU_DbImport
t=SiSU_DbTuple::LoadUrls.new(@conn,f,u,@@id_t,@opt,@file_maint)
tuple=t.tuple
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/db_select.rb b/lib/sisu/v4/db_select.rb
index d8b63b3b..f6d07030 100644
--- a/lib/sisu/v4/db_select.rb
+++ b/lib/sisu/v4/db_select.rb
@@ -127,7 +127,7 @@ module SiSU_DbSelect
@sdb.create_table.urls
@sdb_index.create_indexes
rescue
- SiSU_Errors::InfoError.new($!,$@,'-D').error; @sdb.output_dir? do
+ SiSU_Errors::Rescued.new($!,$@,'-D').location; @sdb.output_dir? do
__LINE__.to_s + ':' + __FILE__
end
end
diff --git a/lib/sisu/v4/dbi.rb b/lib/sisu/v4/dbi.rb
index 20443c7c..3cd9dc85 100644
--- a/lib/sisu/v4/dbi.rb
+++ b/lib/sisu/v4/dbi.rb
@@ -133,7 +133,7 @@ manually create the database: "#{cX.green}#{@db.db}#{cX.off}" if it does not yet
begin
SiSU_DbDBI::Case.new(@opt,@conn,@sql_type).cases
rescue
- SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@cf,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/dbi_discrete.rb b/lib/sisu/v4/dbi_discrete.rb
index 5b7d36bf..d96fbe13 100644
--- a/lib/sisu/v4/dbi_discrete.rb
+++ b/lib/sisu/v4/dbi_discrete.rb
@@ -136,7 +136,7 @@ module SiSU_DBI_Discrete #% database building
tell=SiSU_Screen::Ansi.new(@opt.cmd,"sqlite3 #{db.sqlite.db} database?")
tell.puts_grey if @opt.cmd =~/v/
rescue
- SiSU_Errors::InfoError.new($!,$@,'-d').error do
+ SiSU_Errors::Rescued.new($!,$@,'-d').location do
__LINE__.to_s + ':' + __FILE__
end
sdb.output_dir?
@@ -154,7 +154,7 @@ module SiSU_DBI_Discrete #% database building
SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.cmd =~/q/
@db.sqlite_discrete.conn_sqlite3
rescue
- SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@cf,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/digests.rb b/lib/sisu/v4/digests.rb
index 65a379c4..75a340b0 100644
--- a/lib/sisu/v4/digests.rb
+++ b/lib/sisu/v4/digests.rb
@@ -87,7 +87,7 @@ module SiSU_DigestView
end
SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/embedded.rb b/lib/sisu/v4/embedded.rb
index c0be9351..c36af0e5 100644
--- a/lib/sisu/v4/embedded.rb
+++ b/lib/sisu/v4/embedded.rb
@@ -82,7 +82,7 @@ module SiSU_Embedded
multimedia
begin
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/epub.rb b/lib/sisu/v4/epub.rb
index 0cfdbfa5..d83e3aad 100644
--- a/lib/sisu/v4/epub.rb
+++ b/lib/sisu/v4/epub.rb
@@ -107,7 +107,7 @@ module SiSU_EPUB
SiSU_EPUB::Source::Seg.new(@md,data).songsheet
SiSU_EPUB::Source::Output.new(@md).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -338,7 +338,7 @@ module SiSU_EPUB
@@toc[:seg] << toc[:seg]
@@toc[:scr] << toc[:seg]
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -635,7 +635,7 @@ module SiSU_EPUB
end
out.close
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -650,7 +650,7 @@ module SiSU_EPUB
end
out.close
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -724,7 +724,7 @@ WOK
filename_xhtml.close
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -742,7 +742,7 @@ WOK
filename_xhtml.close
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
diff --git a/lib/sisu/v4/epub_concordance.rb b/lib/sisu/v4/epub_concordance.rb
index 3a8cea75..838e4595 100644
--- a/lib/sisu/v4/epub_concordance.rb
+++ b/lib/sisu/v4/epub_concordance.rb
@@ -89,7 +89,7 @@ module SiSU_EPUB_Concordance
SiSU_EPUB_Concordance::Source::Words.new(@particulars).songsheet
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -172,7 +172,7 @@ WOK
@rgx_splitlist=%r{[—.,;:-]+|#{Mx[:nbsp]}+}mi
@rgx_scanlist=%r{#{Mx[:fa_italics_o]}[a-zA-Z0-9"\s]{2,12}#{Mx[:fa_italics_c]}|#{Mx[:fa_bold_o]}[a-zA-Z0-9"\s]{2,12}#{Mx[:fa_bold_c]}|#{Mx[:url_o]}https?://\S+?#{Mx[:url_c]}|file://\S+|<\S+?>|\w+|[a-zA-Z]+}mi
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -186,7 +186,7 @@ WOK
@file_concordance=File.open("#{@path}/content/#{@md.fn[:epub_concord]}",'w')
map_para
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/epub_segments.rb b/lib/sisu/v4/epub_segments.rb
index ee8ab26e..44db5fe9 100644
--- a/lib/sisu/v4/epub_segments.rb
+++ b/lib/sisu/v4/epub_segments.rb
@@ -144,7 +144,7 @@ WOK
SiSU_EPUB_Seg::Seg.new.cleanup # (((( added ))))
#### (((( END )))) ####
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/epub_tune.rb b/lib/sisu/v4/epub_tune.rb
index e6e92334..45291ca8 100644
--- a/lib/sisu/v4/epub_tune.rb
+++ b/lib/sisu/v4/epub_tune.rb
@@ -133,7 +133,7 @@ module SiSU_EPUB_Tune
end
SiSU_EPUB_Tune::Tune.new(@data,@md).output
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/errors.rb b/lib/sisu/v4/errors.rb
index 13a58f77..fc9726d4 100644
--- a/lib/sisu/v4/errors.rb
+++ b/lib/sisu/v4/errors.rb
@@ -62,7 +62,7 @@
module SiSU_Errors
require_relative 'sysenv' # sysenv.rb
include SiSU_Env; include SiSU_Screen
- class InfoError <CreateFile
+ class Rescued <CreateFile
def initialize(error,errorlist,cmd,fns='')
@fns,@cmd,@error,@errorlist=fns,cmd,error,errorlist
@cmd=(cmd \
@@ -70,7 +70,7 @@ module SiSU_Errors
? 'Vc'
: 'V'
end
- def error
+ def location
file=@fns \
? (SiSU_Env::CreateFile.new(@fns).file_error)
: (File.new('/tmp/errorlog.sisu','w+'))
diff --git a/lib/sisu/v4/html.rb b/lib/sisu/v4/html.rb
index d4987c4d..1dda9aae 100644
--- a/lib/sisu/v4/html.rb
+++ b/lib/sisu/v4/html.rb
@@ -124,7 +124,7 @@ module SiSU_HTML
SiSU_HTML::Source::Output.new(scroll,@md).scroll
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -269,7 +269,7 @@ module SiSU_HTML
@@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 do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -661,7 +661,7 @@ WOK
end
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -683,7 +683,7 @@ WOK
end
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/html_scroll.rb b/lib/sisu/v4/html_scroll.rb
index d167dc57..367e7d70 100644
--- a/lib/sisu/v4/html_scroll.rb
+++ b/lib/sisu/v4/html_scroll.rb
@@ -75,7 +75,7 @@ module SiSU_HTML_Scroll
scr[:tails]=SiSU_HTML_Scroll::Scroll.new(@md).tails
scr
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/html_segments.rb b/lib/sisu/v4/html_segments.rb
index ac3cebac..73386381 100644
--- a/lib/sisu/v4/html_segments.rb
+++ b/lib/sisu/v4/html_segments.rb
@@ -176,7 +176,7 @@ module SiSU_HTML_Seg
SiSU_HTML_Seg::Seg.new.cleanup # (((( added ))))
#### (((( END )))) ####
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/html_tune.rb b/lib/sisu/v4/html_tune.rb
index 84100c9c..1876380a 100644
--- a/lib/sisu/v4/html_tune.rb
+++ b/lib/sisu/v4/html_tune.rb
@@ -134,7 +134,7 @@ module SiSU_HTML_Tune
end
SiSU_HTML_Tune::Tune.new(@data,@md).output
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index cd3cdf91..84c10dd2 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -597,7 +597,7 @@ module SiSU
SiSU_Remote::Get.new(@opt,@get_p).sisupod
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt,@fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt,@fns).location do
__LINE__.to_s + ':' + __FILE__
end
@retry_count +=1
diff --git a/lib/sisu/v4/manifest.rb b/lib/sisu/v4/manifest.rb
index ba5a0556..eb888387 100644
--- a/lib/sisu/v4/manifest.rb
+++ b/lib/sisu/v4/manifest.rb
@@ -96,7 +96,7 @@ module SiSU_Manifest
data=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
SiSU_Manifest::Source::Output.new(@md).check_output(data)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -917,7 +917,7 @@ WOK
WOK
output
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/manpage.rb b/lib/sisu/v4/manpage.rb
index c3e0bbfb..fd4e365d 100644
--- a/lib/sisu/v4/manpage.rb
+++ b/lib/sisu/v4/manpage.rb
@@ -96,7 +96,7 @@ module SiSU_Manpage
@dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/odf.rb b/lib/sisu/v4/odf.rb
index 5350f5a7..acc44ab3 100644
--- a/lib/sisu/v4/odf.rb
+++ b/lib/sisu/v4/odf.rb
@@ -93,7 +93,7 @@ module SiSU_ODF
end
SiSU_ODF::Source::Scroll.new(@particulars).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/param.rb b/lib/sisu/v4/param.rb
index ed70c9c4..86dd6a01 100644
--- a/lib/sisu/v4/param.rb
+++ b/lib/sisu/v4/param.rb
@@ -849,7 +849,7 @@ module SiSU_Param
Dir.chdir(@opt.f_pth[:pth])
begin
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -1408,7 +1408,7 @@ module SiSU_Param
end
@@md=@md=nil
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/particulars.rb b/lib/sisu/v4/particulars.rb
index b7ea2f3a..f7979197 100644
--- a/lib/sisu/v4/particulars.rb
+++ b/lib/sisu/v4/particulars.rb
@@ -122,7 +122,7 @@ module SiSU_Particulars
@md=SiSU_Param::Parameters.new(opt).get
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -133,7 +133,7 @@ module SiSU_Particulars
@env=SiSU_Env::InfoEnv.new(opt.fns)
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -144,7 +144,7 @@ module SiSU_Particulars
@file=SiSU_Env::FileOp.new(@md)
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -155,7 +155,7 @@ module SiSU_Particulars
@dal_array=SiSU_DAL::Source.new(opt).get
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -165,7 +165,7 @@ module SiSU_Particulars
@sst_idx=SiSU_DAL::Source.new(opt).get_idx_sst
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -175,7 +175,7 @@ module SiSU_Particulars
@raw_idx=SiSU_DAL::Source.new(opt).get_idx_raw
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -185,7 +185,7 @@ module SiSU_Particulars
@html_idx=SiSU_DAL::Source.new(opt).get_idx_html
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -195,7 +195,7 @@ module SiSU_Particulars
@xhtml_idx=SiSU_DAL::Source.new(opt).get_idx_xhtml
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -208,11 +208,11 @@ module SiSU_Particulars
self
rescue
if @md
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
else
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -224,7 +224,7 @@ module SiSU_Particulars
@ocn_htmlseg_map=SiSU_DAL::Source.new(@md).get_map_ocn_htmlseg
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
diff --git a/lib/sisu/v4/plaintext.rb b/lib/sisu/v4/plaintext.rb
index 09168466..13e93e9a 100644
--- a/lib/sisu/v4/plaintext.rb
+++ b/lib/sisu/v4/plaintext.rb
@@ -104,7 +104,7 @@ module SiSU_Plaintext
#wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
SiSU_Plaintext::Source::Scroll.new(md,dal_array,wrap_width).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/po4a.rb b/lib/sisu/v4/po4a.rb
index 83aa8d5b..5a74a7d0 100644
--- a/lib/sisu/v4/po4a.rb
+++ b/lib/sisu/v4/po4a.rb
@@ -154,7 +154,7 @@ module SiSU_Po4a
SiSU_Po4a::Source::Scroll.new(fn,@dal_array_lang_src,@dal_array_lang_translation,@@md_src,@@md_trn,wrap_width).songsheet
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/qrcode.rb b/lib/sisu/v4/qrcode.rb
index 3b8cc404..a36d8973 100644
--- a/lib/sisu/v4/qrcode.rb
+++ b/lib/sisu/v4/qrcode.rb
@@ -93,7 +93,7 @@ module SiSU_QRcode
data=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
OutputInfo.new(@md).check_output(data)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -714,7 +714,7 @@ WOK
output_metadata
output_metadata_short
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/rexml.rb b/lib/sisu/v4/rexml.rb
index 04d96d97..b89fada7 100644
--- a/lib/sisu/v4/rexml.rb
+++ b/lib/sisu/v4/rexml.rb
@@ -106,7 +106,7 @@ module SiSU_Rexml
exit
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/sitemaps.rb b/lib/sisu/v4/sitemaps.rb
index f3521dc9..194f1220 100644
--- a/lib/sisu/v4/sitemaps.rb
+++ b/lib/sisu/v4/sitemaps.rb
@@ -94,7 +94,7 @@ module SiSU_Sitemaps
SiSU_Screen::Ansi.new(@opt.cmd,"sitemap index:","#{@env.path.output}/#{@sitemap_idx_fn}").result unless @opt.cmd =~/q/
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/sst_do_inline_footnotes.rb b/lib/sisu/v4/sst_do_inline_footnotes.rb
index d7b40cd7..b65c99af 100644
--- a/lib/sisu/v4/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v4/sst_do_inline_footnotes.rb
@@ -96,7 +96,7 @@ module SiSU_ConvertFootnotes
@@fns=@opt.fns
create_dal
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -114,7 +114,7 @@ module SiSU_ConvertFootnotes
? read_fnm
: @@dal_array.dup #check
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/sst_to_s_xml_sax.rb b/lib/sisu/v4/sst_to_s_xml_sax.rb
index 5b8febf0..bbf81c5a 100644
--- a/lib/sisu/v4/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v4/sst_to_s_xml_sax.rb
@@ -99,7 +99,7 @@ module SiSU_SimpleXML_ModelSax
end
SiSU_SimpleXML_ModelSax::Convert::Songsheet.new(@fns_array,@particulars).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure #file closed in songsheet
@@ -123,7 +123,7 @@ module SiSU_SimpleXML_ModelSax
SiSU_SimpleXML_ModelSax::Convert::Tidy.new(@md,@env).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
SiSU_Rexml::Rexml.new(@md,@md.fn[:sxs]).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/texpdf.rb b/lib/sisu/v4/texpdf.rb
index d9aa2607..82b47218 100644
--- a/lib/sisu/v4/texpdf.rb
+++ b/lib/sisu/v4/texpdf.rb
@@ -98,7 +98,7 @@ module SiSU_TeX
Dir.mkdir(@env.processing_path.tex) unless FileTest.directory?(@env.processing_path.tex)
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -131,7 +131,7 @@ module SiSU_TeX
SiSU_TeX::Source::LaTeXtoPdf.new(@md,@particulars.env).latexrun_selective
Dir.chdir(pwd)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -297,7 +297,7 @@ module SiSU_TeX
lst=Dir["*.{aux,log,out}"]
lst.each {|file| File.unlink(file)} if lst
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -372,7 +372,7 @@ module SiSU_TeX
data=markup(data)
output(data)
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/update.rb b/lib/sisu/v4/update.rb
index e5b9a504..1d7e1cff 100644
--- a/lib/sisu/v4/update.rb
+++ b/lib/sisu/v4/update.rb
@@ -76,7 +76,7 @@ module SiSU_UpdateControlFlag
SiSU_Screen::Ansi.new(@md.opt.cmd,'Checking previous output',base_path).green_hi_blue unless @md.opt.cmd =~/q/
SetCF.new(@md).set_flags
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/urls.rb b/lib/sisu/v4/urls.rb
index f0293a40..af586c52 100644
--- a/lib/sisu/v4/urls.rb
+++ b/lib/sisu/v4/urls.rb
@@ -73,7 +73,7 @@ module SiSU_Urls
begin
SiSU_Urls::OutputUrls.new(@opt).songsheet if @opt.fnb
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -126,7 +126,7 @@ module SiSU_Urls
begin
@opt.cmd=~/U/ ? urls_all : (urls_select unless @opt.cmd=~/q/)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/webrick.rb b/lib/sisu/v4/webrick.rb
index 1b1b6bd8..15e86d87 100644
--- a/lib/sisu/v4/webrick.rb
+++ b/lib/sisu/v4/webrick.rb
@@ -151,7 +151,7 @@ WOK
brick(@port,get)
rescue
require_relative 'sysenv' # sysenv.rb
- SiSU_Errors::InfoError.new($!,$@,'-W',nil).error do #fix
+ SiSU_Errors::Rescued.new($!,$@,'-W',nil).location do #fix
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -176,7 +176,7 @@ WOK
trap("INT"){ s.shutdown }
s.start
rescue
- SiSU_Errors::InfoError.new($!,$@,'-W',nil).error do #fix
+ SiSU_Errors::Rescued.new($!,$@,'-W',nil).location do #fix
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/wikispeak.rb b/lib/sisu/v4/wikispeak.rb
index 9e171367..fa2d9ddb 100644
--- a/lib/sisu/v4/wikispeak.rb
+++ b/lib/sisu/v4/wikispeak.rb
@@ -88,7 +88,7 @@ module SiSU_Wikispeak
@dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
SiSU_Wikispeak::Source::Scroll.new(@dal_array,@md).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/xhtml.rb b/lib/sisu/v4/xhtml.rb
index a62c942f..c4c708ef 100644
--- a/lib/sisu/v4/xhtml.rb
+++ b/lib/sisu/v4/xhtml.rb
@@ -97,7 +97,7 @@ module SiSU_XHTML
end
SiSU_XHTML::Source::Songsheet.new(@particulars).song
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -116,7 +116,7 @@ module SiSU_XHTML
SiSU_XHTML::Source::Tidy.new(@md,@file.place_file.xhtml.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
SiSU_Rexml::Rexml.new(@md,@file.place_file.xhtml.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/xml.rb b/lib/sisu/v4/xml.rb
index 3599734c..106b1ed3 100644
--- a/lib/sisu/v4/xml.rb
+++ b/lib/sisu/v4/xml.rb
@@ -95,7 +95,7 @@ module SiSU_XML_SAX
end
SiSU_XML_SAX::Source::Songsheet.new(@particulars).song
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -115,7 +115,7 @@ module SiSU_XML_SAX
SiSU_XML_SAX::Source::Tidy.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/xml_dom.rb b/lib/sisu/v4/xml_dom.rb
index 8660dbf3..057f8532 100644
--- a/lib/sisu/v4/xml_dom.rb
+++ b/lib/sisu/v4/xml_dom.rb
@@ -96,7 +96,7 @@ module SiSU_XML_DOM
end
SiSU_XML_DOM::Source::Songsheet.new(@particulars).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -115,7 +115,7 @@ module SiSU_XML_DOM
SiSU_XML_DOM::Source::Tidy.new(@md,@file.place_file.xml_dom.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_dom.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/xml_fictionbook.rb b/lib/sisu/v4/xml_fictionbook.rb
index dcf11fc0..119f7d78 100644
--- a/lib/sisu/v4/xml_fictionbook.rb
+++ b/lib/sisu/v4/xml_fictionbook.rb
@@ -79,7 +79,7 @@ module SiSU_XML_Fictionbook
@dal_array=SiSU_DAL::Source.new(@opt).get
SiSU_XML_Fictionbook::Source::Scroll.new(@dal_array,@md).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v4/xml_scaffold.rb b/lib/sisu/v4/xml_scaffold.rb
index 98792017..0608a17f 100644
--- a/lib/sisu/v4/xml_scaffold.rb
+++ b/lib/sisu/v4/xml_scaffold.rb
@@ -76,7 +76,7 @@ module SiSU_XML_Scaffold
@md,@dal_array=@particulars.md,@particulars.dal_array
SiSU_XML_Scaffold::Source::Scroll.new(@dal_array,@md).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/composite.rb b/lib/sisu/v5/composite.rb
index bd78cc4b..442cfada 100644
--- a/lib/sisu/v5/composite.rb
+++ b/lib/sisu/v5/composite.rb
@@ -103,7 +103,7 @@ module SiSU_Assemble
write(assembled)
Dir.chdir(pwd)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -220,7 +220,7 @@ module SiSU_Assemble
@fns_array=IO.readlines(@opt.fns,'')
insertions?
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/concordance.rb b/lib/sisu/v5/concordance.rb
index 96f293f2..060409b2 100644
--- a/lib/sisu/v5/concordance.rb
+++ b/lib/sisu/v5/concordance.rb
@@ -99,7 +99,7 @@ module SiSU_Concordance
SiSU_Concordance::Source::Words.new(@particulars).songsheet
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -216,7 +216,7 @@ WOK
@alphlst=SiSU_i18n::Alphabet.new(@md.opt.lng).hash_strings
@rgx_scanlist=%r{#{Mx[:fa_italics_o]}[#{@alphlst[:l]}#{@alphlst[:u]}0-9"\s]{2,12}#{Mx[:fa_italics_c]}|#{Mx[:fa_bold_o]}[#{@alphlst[:l]}#{@alphlst[:u]}0-9"\s]{2,12}#{Mx[:fa_bold_c]}|(?:https?|file)://\S+|<\S+?>|[#{@alphlst[:l]}#{@alphlst[:u]}]+|\w+}mi
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -227,7 +227,7 @@ WOK
@file_concordance=File.open(@file.place_file.html_concordance.dir,'w')
map_para
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/dal.rb b/lib/sisu/v5/dal.rb
index ed03969f..5bf9b87c 100644
--- a/lib/sisu/v5/dal.rb
+++ b/lib/sisu/v5/dal.rb
@@ -123,7 +123,7 @@ module SiSU_DAL
: @opt.fns
create_dal
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@@fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@@fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -144,7 +144,7 @@ module SiSU_DAL
? read_fnc
: @@dal_array.dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -163,7 +163,7 @@ module SiSU_DAL
end
dal=(@@idx_arr[:sst].empty?) ? read_idx_sst : @@idx_arr[:sst].dup #check
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -182,7 +182,7 @@ module SiSU_DAL
end
dal=(@@idx_arr[:tex].empty?) ? read_idx_raw : @@idx_arr[:tex].dup #check
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -201,7 +201,7 @@ module SiSU_DAL
end
dal=(@@idx_arr[:html].empty?) ? read_idx_html : @@idx_arr[:html].dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -220,7 +220,7 @@ module SiSU_DAL
end
dal=(@@idx_arr[:xhtml].empty?) ? read_idx_xhtml : @@idx_arr[:xhtml].dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -239,7 +239,7 @@ module SiSU_DAL
end
dal=(@@map_arr[:nametags].empty?) ? read_map_nametags : @@map_arr[:nametags].dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -258,7 +258,7 @@ module SiSU_DAL
end
dal=(@@map_arr[:ocn_htmlseg].empty?) ? read_map_ocn_htmlseg : @@map_arr[:ocn_htmlseg].dup
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/db_drop.rb b/lib/sisu/v5/db_drop.rb
index caf7faa5..252a311b 100644
--- a/lib/sisu/v5/db_drop.rb
+++ b/lib/sisu/v5/db_drop.rb
@@ -108,7 +108,7 @@ module SiSU_DbDrop
sdb.create_table.urls
sdb_index.create_indexes
rescue
- SiSU_Errors::InfoError.new($!,$@,'-D').error do
+ SiSU_Errors::Rescued.new($!,$@,'-D').location do
__LINE__.to_s + ':' + __FILE__
end
sdb.output_dir?
diff --git a/lib/sisu/v5/db_import.rb b/lib/sisu/v5/db_import.rb
index 9025b359..5f89c968 100644
--- a/lib/sisu/v5/db_import.rb
+++ b/lib/sisu/v5/db_import.rb
@@ -171,7 +171,7 @@ module SiSU_DbImport
STDERR.puts "Error code: #{e.err}"
STDERR.puts "Error message: #{e.errstr}"
STDERR.puts "Error SQLSTATE: #{e.state}"
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
sqlfn="#{@env.processing_path.sql}/#{@md.fnb}.sql"
@@ -184,7 +184,7 @@ module SiSU_DbImport
puts "#{__FILE__}:#{__LINE__}"
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
sqlfn="#{@env.processing_path.sql}/#{@md.fnb}.sql"
@@ -569,7 +569,7 @@ module SiSU_DbImport
end
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -702,7 +702,7 @@ module SiSU_DbImport
t=SiSU_DbTuple::LoadUrls.new(@conn,f,u,@@id_t,@opt,@file_maint)
tuple=t.tuple
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/db_select.rb b/lib/sisu/v5/db_select.rb
index 845cafde..879862b1 100644
--- a/lib/sisu/v5/db_select.rb
+++ b/lib/sisu/v5/db_select.rb
@@ -127,7 +127,7 @@ module SiSU_DbSelect
@sdb.create_table.urls
@sdb_index.create_indexes
rescue
- SiSU_Errors::InfoError.new($!,$@,'-D').error; @sdb.output_dir? do
+ SiSU_Errors::Rescued.new($!,$@,'-D').location; @sdb.output_dir? do
__LINE__.to_s + ':' + __FILE__
end
end
diff --git a/lib/sisu/v5/dbi.rb b/lib/sisu/v5/dbi.rb
index 2d8ac64e..cc2b614e 100644
--- a/lib/sisu/v5/dbi.rb
+++ b/lib/sisu/v5/dbi.rb
@@ -133,7 +133,7 @@ manually create the database: "#{cX.green}#{@db.db}#{cX.off}" if it does not yet
begin
SiSU_DbDBI::Case.new(@opt,@conn,@sql_type).cases
rescue
- SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@cf,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb
index 572ac154..fe921c85 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/v5/dbi_discrete.rb
@@ -136,7 +136,7 @@ module SiSU_DBI_Discrete #% database building
tell=SiSU_Screen::Ansi.new(@opt.cmd,"sqlite3 #{db.sqlite.db} database?")
tell.puts_grey if @opt.cmd =~/v/
rescue
- SiSU_Errors::InfoError.new($!,$@,'-d').error do
+ SiSU_Errors::Rescued.new($!,$@,'-d').location do
__LINE__.to_s + ':' + __FILE__
end
sdb.output_dir?
@@ -154,7 +154,7 @@ module SiSU_DBI_Discrete #% database building
SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.cmd =~/q/
@db.sqlite_discrete.conn_sqlite3
rescue
- SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@cf,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/digests.rb b/lib/sisu/v5/digests.rb
index 9eba6544..ea2e81cd 100644
--- a/lib/sisu/v5/digests.rb
+++ b/lib/sisu/v5/digests.rb
@@ -87,7 +87,7 @@ module SiSU_DigestView
end
SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/embedded.rb b/lib/sisu/v5/embedded.rb
index c7fec7ed..5ce0bf04 100644
--- a/lib/sisu/v5/embedded.rb
+++ b/lib/sisu/v5/embedded.rb
@@ -82,7 +82,7 @@ module SiSU_Embedded
multimedia
begin
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/epub.rb b/lib/sisu/v5/epub.rb
index 960ddd68..26f1dc0d 100644
--- a/lib/sisu/v5/epub.rb
+++ b/lib/sisu/v5/epub.rb
@@ -107,7 +107,7 @@ module SiSU_EPUB
SiSU_EPUB::Source::Seg.new(@md,data).songsheet
SiSU_EPUB::Source::Output.new(@md).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -338,7 +338,7 @@ module SiSU_EPUB
@@toc[:seg] << toc[:seg]
@@toc[:scr] << toc[:seg]
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -635,7 +635,7 @@ module SiSU_EPUB
end
out.close
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -650,7 +650,7 @@ module SiSU_EPUB
end
out.close
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -724,7 +724,7 @@ WOK
filename_xhtml.close
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -742,7 +742,7 @@ WOK
filename_xhtml.close
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
diff --git a/lib/sisu/v5/epub_concordance.rb b/lib/sisu/v5/epub_concordance.rb
index 8940c3a3..976ca619 100644
--- a/lib/sisu/v5/epub_concordance.rb
+++ b/lib/sisu/v5/epub_concordance.rb
@@ -89,7 +89,7 @@ module SiSU_EPUB_Concordance
SiSU_EPUB_Concordance::Source::Words.new(@particulars).songsheet
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -172,7 +172,7 @@ WOK
@rgx_splitlist=%r{[—.,;:-]+|#{Mx[:nbsp]}+}mi
@rgx_scanlist=%r{#{Mx[:fa_italics_o]}[a-zA-Z0-9"\s]{2,12}#{Mx[:fa_italics_c]}|#{Mx[:fa_bold_o]}[a-zA-Z0-9"\s]{2,12}#{Mx[:fa_bold_c]}|#{Mx[:url_o]}https?://\S+?#{Mx[:url_c]}|file://\S+|<\S+?>|\w+|[a-zA-Z]+}mi
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -186,7 +186,7 @@ WOK
@file_concordance=File.open("#{@path}/content/#{@md.fn[:epub_concord]}",'w')
map_para
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/epub_segments.rb b/lib/sisu/v5/epub_segments.rb
index ee85619d..9f483610 100644
--- a/lib/sisu/v5/epub_segments.rb
+++ b/lib/sisu/v5/epub_segments.rb
@@ -144,7 +144,7 @@ WOK
SiSU_EPUB_Seg::Seg.new.cleanup # (((( added ))))
#### (((( END )))) ####
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/epub_tune.rb b/lib/sisu/v5/epub_tune.rb
index 256ed323..c017c2df 100644
--- a/lib/sisu/v5/epub_tune.rb
+++ b/lib/sisu/v5/epub_tune.rb
@@ -133,7 +133,7 @@ module SiSU_EPUB_Tune
end
SiSU_EPUB_Tune::Tune.new(@data,@md).output
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/errors.rb b/lib/sisu/v5/errors.rb
index 9721bf72..37a8e1a5 100644
--- a/lib/sisu/v5/errors.rb
+++ b/lib/sisu/v5/errors.rb
@@ -62,7 +62,7 @@
module SiSU_Errors
require_relative 'sysenv' # sysenv.rb
include SiSU_Env; include SiSU_Screen
- class InfoError <CreateFile
+ class Rescued <CreateFile
def initialize(error,errorlist,cmd,fns='')
@fns,@cmd,@error,@errorlist=fns,cmd,error,errorlist
@cmd=(cmd \
@@ -70,7 +70,7 @@ module SiSU_Errors
? 'Vc'
: 'V'
end
- def error
+ def location
file=@fns \
? (SiSU_Env::CreateFile.new(@fns).file_error)
: (File.new('/tmp/errorlog.sisu','w+'))
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb
index 753d34b8..f0b22285 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/v5/html.rb
@@ -124,7 +124,7 @@ module SiSU_HTML
SiSU_HTML::Source::Output.new(scroll,@md).scroll
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -269,7 +269,7 @@ module SiSU_HTML
@@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 do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -661,7 +661,7 @@ WOK
end
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -683,7 +683,7 @@ WOK
end
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/html_scroll.rb b/lib/sisu/v5/html_scroll.rb
index a79de81b..3ac75aaa 100644
--- a/lib/sisu/v5/html_scroll.rb
+++ b/lib/sisu/v5/html_scroll.rb
@@ -75,7 +75,7 @@ module SiSU_HTML_Scroll
scr[:tails]=SiSU_HTML_Scroll::Scroll.new(@md).tails
scr
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/html_segments.rb b/lib/sisu/v5/html_segments.rb
index 9e555ad0..8d7ec675 100644
--- a/lib/sisu/v5/html_segments.rb
+++ b/lib/sisu/v5/html_segments.rb
@@ -176,7 +176,7 @@ module SiSU_HTML_Seg
SiSU_HTML_Seg::Seg.new.cleanup # (((( added ))))
#### (((( END )))) ####
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb
index 5d7e9beb..ceadcf50 100644
--- a/lib/sisu/v5/html_tune.rb
+++ b/lib/sisu/v5/html_tune.rb
@@ -134,7 +134,7 @@ module SiSU_HTML_Tune
end
SiSU_HTML_Tune::Tune.new(@data,@md).output
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index 7c1bb406..052d983c 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -597,7 +597,7 @@ module SiSU
SiSU_Remote::Get.new(@opt,@get_p).sisupod
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt,@fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt,@fns).location do
__LINE__.to_s + ':' + __FILE__
end
@retry_count +=1
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index 4a234d61..95112a7a 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -96,7 +96,7 @@ module SiSU_Manifest
data=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
SiSU_Manifest::Source::Output.new(@md).check_output(data)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -917,7 +917,7 @@ WOK
WOK
output
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index 62aa9456..dc0d6203 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -96,7 +96,7 @@ module SiSU_Manpage
@dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/odf.rb b/lib/sisu/v5/odf.rb
index 281bd7a4..21243e6f 100644
--- a/lib/sisu/v5/odf.rb
+++ b/lib/sisu/v5/odf.rb
@@ -93,7 +93,7 @@ module SiSU_ODF
end
SiSU_ODF::Source::Scroll.new(@particulars).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/param.rb b/lib/sisu/v5/param.rb
index 0e24b419..0720f943 100644
--- a/lib/sisu/v5/param.rb
+++ b/lib/sisu/v5/param.rb
@@ -849,7 +849,7 @@ module SiSU_Param
Dir.chdir(@opt.f_pth[:pth])
begin
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -1408,7 +1408,7 @@ module SiSU_Param
end
@@md=@md=nil
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/particulars.rb b/lib/sisu/v5/particulars.rb
index 7cc54737..000748ff 100644
--- a/lib/sisu/v5/particulars.rb
+++ b/lib/sisu/v5/particulars.rb
@@ -122,7 +122,7 @@ module SiSU_Particulars
@md=SiSU_Param::Parameters.new(opt).get
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -133,7 +133,7 @@ module SiSU_Particulars
@env=SiSU_Env::InfoEnv.new(opt.fns)
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -144,7 +144,7 @@ module SiSU_Particulars
@file=SiSU_Env::FileOp.new(@md)
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -155,7 +155,7 @@ module SiSU_Particulars
@dal_array=SiSU_DAL::Source.new(opt).get
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -165,7 +165,7 @@ module SiSU_Particulars
@sst_idx=SiSU_DAL::Source.new(opt).get_idx_sst
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -175,7 +175,7 @@ module SiSU_Particulars
@raw_idx=SiSU_DAL::Source.new(opt).get_idx_raw
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -185,7 +185,7 @@ module SiSU_Particulars
@html_idx=SiSU_DAL::Source.new(opt).get_idx_html
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -195,7 +195,7 @@ module SiSU_Particulars
@xhtml_idx=SiSU_DAL::Source.new(opt).get_idx_xhtml
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -208,11 +208,11 @@ module SiSU_Particulars
self
rescue
if @md
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
else
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -224,7 +224,7 @@ module SiSU_Particulars
@ocn_htmlseg_map=SiSU_DAL::Source.new(@md).get_map_ocn_htmlseg
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
diff --git a/lib/sisu/v5/plaintext.rb b/lib/sisu/v5/plaintext.rb
index f5701b68..443b274b 100644
--- a/lib/sisu/v5/plaintext.rb
+++ b/lib/sisu/v5/plaintext.rb
@@ -104,7 +104,7 @@ module SiSU_Plaintext
#wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
SiSU_Plaintext::Source::Scroll.new(md,dal_array,wrap_width).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/po4a.rb b/lib/sisu/v5/po4a.rb
index a152a397..d1106c7b 100644
--- a/lib/sisu/v5/po4a.rb
+++ b/lib/sisu/v5/po4a.rb
@@ -154,7 +154,7 @@ module SiSU_Po4a
SiSU_Po4a::Source::Scroll.new(fn,@dal_array_lang_src,@dal_array_lang_translation,@@md_src,@@md_trn,wrap_width).songsheet
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/v5/qrcode.rb
index 65f127f7..e0878dd0 100644
--- a/lib/sisu/v5/qrcode.rb
+++ b/lib/sisu/v5/qrcode.rb
@@ -93,7 +93,7 @@ module SiSU_QRcode
data=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
OutputInfo.new(@md).check_output(data)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -714,7 +714,7 @@ WOK
output_metadata
output_metadata_short
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/rexml.rb b/lib/sisu/v5/rexml.rb
index ac8583f1..7c5cb6fb 100644
--- a/lib/sisu/v5/rexml.rb
+++ b/lib/sisu/v5/rexml.rb
@@ -106,7 +106,7 @@ module SiSU_Rexml
exit
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/sitemaps.rb b/lib/sisu/v5/sitemaps.rb
index a8cb5e97..c95404ca 100644
--- a/lib/sisu/v5/sitemaps.rb
+++ b/lib/sisu/v5/sitemaps.rb
@@ -94,7 +94,7 @@ module SiSU_Sitemaps
SiSU_Screen::Ansi.new(@opt.cmd,"sitemap index:","#{@env.path.output}/#{@sitemap_idx_fn}").result unless @opt.cmd =~/q/
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/sst_do_inline_footnotes.rb b/lib/sisu/v5/sst_do_inline_footnotes.rb
index 2fc4d90f..02b4a171 100644
--- a/lib/sisu/v5/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v5/sst_do_inline_footnotes.rb
@@ -96,7 +96,7 @@ module SiSU_ConvertFootnotes
@@fns=@opt.fns
create_dal
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -114,7 +114,7 @@ module SiSU_ConvertFootnotes
? read_fnm
: @@dal_array.dup #check
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/sst_to_s_xml_sax.rb b/lib/sisu/v5/sst_to_s_xml_sax.rb
index cc1a5347..e40e21d4 100644
--- a/lib/sisu/v5/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v5/sst_to_s_xml_sax.rb
@@ -99,7 +99,7 @@ module SiSU_SimpleXML_ModelSax
end
SiSU_SimpleXML_ModelSax::Convert::Songsheet.new(@fns_array,@particulars).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure #file closed in songsheet
@@ -123,7 +123,7 @@ module SiSU_SimpleXML_ModelSax
SiSU_SimpleXML_ModelSax::Convert::Tidy.new(@md,@env).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
SiSU_Rexml::Rexml.new(@md,@md.fn[:sxs]).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb
index 4cf4e8f8..18d2d2a0 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -98,7 +98,7 @@ module SiSU_TeX
Dir.mkdir(@env.processing_path.tex) unless FileTest.directory?(@env.processing_path.tex)
end
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -131,7 +131,7 @@ module SiSU_TeX
SiSU_TeX::Source::LaTeXtoPdf.new(@md,@particulars.env).latexrun_selective
Dir.chdir(pwd)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -297,7 +297,7 @@ module SiSU_TeX
lst=Dir["*.{aux,log,out}"]
lst.each {|file| File.unlink(file)} if lst
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -372,7 +372,7 @@ module SiSU_TeX
data=markup(data)
output(data)
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/update.rb b/lib/sisu/v5/update.rb
index 2d2a4115..cfa4c1c0 100644
--- a/lib/sisu/v5/update.rb
+++ b/lib/sisu/v5/update.rb
@@ -76,7 +76,7 @@ module SiSU_UpdateControlFlag
SiSU_Screen::Ansi.new(@md.opt.cmd,'Checking previous output',base_path).green_hi_blue unless @md.opt.cmd =~/q/
SetCF.new(@md).set_flags
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/urls.rb b/lib/sisu/v5/urls.rb
index 40bb90ed..3b9f5034 100644
--- a/lib/sisu/v5/urls.rb
+++ b/lib/sisu/v5/urls.rb
@@ -73,7 +73,7 @@ module SiSU_Urls
begin
SiSU_Urls::OutputUrls.new(@opt).songsheet if @opt.fnb
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -126,7 +126,7 @@ module SiSU_Urls
begin
@opt.cmd=~/U/ ? urls_all : (urls_select unless @opt.cmd=~/q/)
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/webrick.rb b/lib/sisu/v5/webrick.rb
index 021a03a4..f4a262e9 100644
--- a/lib/sisu/v5/webrick.rb
+++ b/lib/sisu/v5/webrick.rb
@@ -151,7 +151,7 @@ WOK
brick(@port,get)
rescue
require_relative 'sysenv' # sysenv.rb
- SiSU_Errors::InfoError.new($!,$@,'-W',nil).error do #fix
+ SiSU_Errors::Rescued.new($!,$@,'-W',nil).location do #fix
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -176,7 +176,7 @@ WOK
trap("INT"){ s.shutdown }
s.start
rescue
- SiSU_Errors::InfoError.new($!,$@,'-W',nil).error do #fix
+ SiSU_Errors::Rescued.new($!,$@,'-W',nil).location do #fix
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/wikispeak.rb b/lib/sisu/v5/wikispeak.rb
index ea6c8fe1..838afa36 100644
--- a/lib/sisu/v5/wikispeak.rb
+++ b/lib/sisu/v5/wikispeak.rb
@@ -88,7 +88,7 @@ module SiSU_Wikispeak
@dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
SiSU_Wikispeak::Source::Scroll.new(@dal_array,@md).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/v5/xhtml.rb
index 3bb332ce..1a194139 100644
--- a/lib/sisu/v5/xhtml.rb
+++ b/lib/sisu/v5/xhtml.rb
@@ -97,7 +97,7 @@ module SiSU_XHTML
end
SiSU_XHTML::Source::Songsheet.new(@particulars).song
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -116,7 +116,7 @@ module SiSU_XHTML
SiSU_XHTML::Source::Tidy.new(@md,@file.place_file.xhtml.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
SiSU_Rexml::Rexml.new(@md,@file.place_file.xhtml.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/xml.rb b/lib/sisu/v5/xml.rb
index a5048746..99fd184e 100644
--- a/lib/sisu/v5/xml.rb
+++ b/lib/sisu/v5/xml.rb
@@ -95,7 +95,7 @@ module SiSU_XML_SAX
end
SiSU_XML_SAX::Source::Songsheet.new(@particulars).song
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -115,7 +115,7 @@ module SiSU_XML_SAX
SiSU_XML_SAX::Source::Tidy.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb
index d22e0434..29d8ea7e 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/v5/xml_dom.rb
@@ -96,7 +96,7 @@ module SiSU_XML_DOM
end
SiSU_XML_DOM::Source::Songsheet.new(@particulars).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -115,7 +115,7 @@ module SiSU_XML_DOM
SiSU_XML_DOM::Source::Tidy.new(@md,@file.place_file.xml_dom.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use
SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_dom.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug
rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/xml_fictionbook.rb b/lib/sisu/v5/xml_fictionbook.rb
index 957e89c9..05a02c9b 100644
--- a/lib/sisu/v5/xml_fictionbook.rb
+++ b/lib/sisu/v5/xml_fictionbook.rb
@@ -79,7 +79,7 @@ module SiSU_XML_Fictionbook
@dal_array=SiSU_DAL::Source.new(@opt).get
SiSU_XML_Fictionbook::Source::Scroll.new(@dal_array,@md).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
diff --git a/lib/sisu/v5/xml_scaffold.rb b/lib/sisu/v5/xml_scaffold.rb
index a5151613..c935c384 100644
--- a/lib/sisu/v5/xml_scaffold.rb
+++ b/lib/sisu/v5/xml_scaffold.rb
@@ -76,7 +76,7 @@ module SiSU_XML_Scaffold
@md,@dal_array=@particulars.md,@particulars.dal_array
SiSU_XML_Scaffold::Source::Scroll.new(@dal_array,@md).songsheet
rescue
- SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+ SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
--
cgit v1.2.3