diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-05-12 19:30:03 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-05-12 19:30:03 -0400 |
| commit | 5774f08063724011fc90eaa7627e6f8660bc690e (patch) | |
| tree | e8f7be4187ab6ee99d34f9863777b22e02d90e51 /lib/sisu/v3/dbi_discreet.rb | |
| parent | debian/changelog (3.2.7-1) (diff) | |
| parent | v3: sisupod make, re-fixed, check again (diff) | |
Merge tag 'sisu_3.2.8' into debian/sid
Diffstat (limited to 'lib/sisu/v3/dbi_discreet.rb')
| -rw-r--r-- | lib/sisu/v3/dbi_discreet.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/sisu/v3/dbi_discreet.rb b/lib/sisu/v3/dbi_discreet.rb index 8f7f0c53..b0943d7d 100644 --- a/lib/sisu/v3/dbi_discreet.rb +++ b/lib/sisu/v3/dbi_discreet.rb @@ -119,7 +119,7 @@ module SiSU_DBI_Discreet #% database building sdb_index=SiSU_DbDBI::Index.new(@opt,conn,@file_maint,'sqlite') sdb.output_dir? begin - SiSU_Screen::Ansi.new(@opt.cmd,'SQLite',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}").green_title_hi unless @opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@opt.cmd,'SQLite',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").green_title_hi unless @opt.cmd =~/q/ sdb.create_db sdb.create_table.metadata_and_text sdb.create_table.doc_objects @@ -133,7 +133,11 @@ module SiSU_DBI_Discreet #% database building sdb_import.marshal_load 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; sdb.output_dir? + rescue + SiSU_Errors::InfoError.new($!,$@,'-d').error do + __LINE__.to_s + ':' + __FILE__ + end + sdb.output_dir? end end def read_sqlite @@ -149,7 +153,9 @@ module SiSU_DBI_Discreet #% database building SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.cmd =~/q/ @db.sqlite_discreet.conn_sqlite3 rescue - SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error + SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error do + __LINE__.to_s + ':' + __FILE__ + end ensure end end |