From 5af7a5e47fff51efd7602bc0f240e64cd6f33b95 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 6 May 2012 23:48:53 -0400
Subject: v3: rescue & error warnings, some touched

---
 lib/sisu/v3/dal.rb | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

(limited to 'lib/sisu/v3/dal.rb')

diff --git a/lib/sisu/v3/dal.rb b/lib/sisu/v3/dal.rb
index bd8d32dd..89dd8fdb 100644
--- a/lib/sisu/v3/dal.rb
+++ b/lib/sisu/v3/dal.rb
@@ -117,7 +117,10 @@ module SiSU_DAL
         ? @fnx
         : @opt.fns
         create_dal
-      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@@fns).error
+      rescue
+        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@@fns).error do
+          __LINE__.to_s + ':' + __FILE__
+        end
       ensure
         SiSU_DAL::Instantiate.new
       end
@@ -132,8 +135,13 @@ module SiSU_DAL
           : @opt.fns
           @@dal_array=[]
         end
-        dal=(@@dal_array.empty?) ? read_fnc : @@dal_array.dup
-      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
+        dal=(@@dal_array.empty?) \
+        ? read_fnc
+        : @@dal_array.dup
+      rescue
+        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+          __LINE__.to_s + ':' + __FILE__
+        end
       ensure
         SiSU_DAL::Instantiate.new
       end
@@ -149,7 +157,10 @@ module SiSU_DAL
           @@idx_arr[:sst]=[]
         end
         dal=(@@idx_arr[:sst].empty?) ? read_idx_sst : @@idx_arr[:sst].dup #check
-      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
         SiSU_DAL::Instantiate.new
       end
@@ -165,7 +176,10 @@ module SiSU_DAL
           @@idx_arr[:tex]=[]
         end
         dal=(@@idx_arr[:tex].empty?) ? read_idx_tex : @@idx_arr[:tex].dup #check
-      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
         SiSU_DAL::Instantiate.new
       end
@@ -181,7 +195,10 @@ module SiSU_DAL
           @@idx_arr[:html]=[]
         end
         dal=(@@idx_arr[:html].empty?) ? read_idx_html : @@idx_arr[:html].dup
-      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
         SiSU_DAL::Instantiate.new
       end
@@ -197,7 +214,10 @@ module SiSU_DAL
           @@idx_arr[:xthml]=[]
         end
         dal=(@@idx_arr[:xhtml].empty?) ? read_idx_xhtml : @@idx_arr[:xhtml].dup
-      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
         SiSU_DAL::Instantiate.new
       end
@@ -213,7 +233,10 @@ module SiSU_DAL
           @@map_arr[:nametags]=[]
         end
         dal=(@@map_arr[:nametags].empty?) ? read_map_nametags : @@map_arr[:nametags].dup
-      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
         SiSU_DAL::Instantiate.new
       end
@@ -229,7 +252,10 @@ module SiSU_DAL
           @@map_arr[:ocn_htmlseg]=[]
         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
+      rescue
+        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+          __LINE__.to_s + ':' + __FILE__
+        end
       ensure
         SiSU_DAL::Instantiate.new
       end
-- 
cgit v1.2.3