diff options
Diffstat (limited to 'lib/sisu/v6/db_import.rb')
| -rw-r--r-- | lib/sisu/v6/db_import.rb | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/lib/sisu/v6/db_import.rb b/lib/sisu/v6/db_import.rb index 35fb631a..f3e8b96c 100644 --- a/lib/sisu/v6/db_import.rb +++ b/lib/sisu/v6/db_import.rb @@ -91,7 +91,9 @@ module SiSU_DbImport @counter={} @db=SiSU_Env::InfoDb.new if @sql_type==:sqlite - @driver_sqlite3=(@conn.inspect.match(/^(.{10})/)[1]==@db.sqlite.conn_sqlite3.inspect.match(/^(.{10})/)[1]) \ + @driver_sqlite3= + (@conn.inspect.match(/^(.{10})/)[1] \ + == @db.sqlite.conn_sqlite3.inspect.match(/^(.{10})/)[1]) \ ? true : false end @@ -100,7 +102,7 @@ module SiSU_DbImport @col[:lid] ||=0 @col[:lid]=@driver_sqlite3 \ ? @conn.execute( sql ).join.to_i - : @conn.execute( sql ) { |x| x.fetch_all.flatten[0] } + : @conn.exec( sql ).getvalue(0,0).to_i rescue puts "#{__FILE__}:#{__LINE__}" if @opt.act[:maintenance][:set]==:on end @@ -109,7 +111,7 @@ module SiSU_DbImport begin @id_n=@driver_sqlite3 \ ? @conn.execute( sql ).join.to_i - : @id_n=@conn.exec( sql ).getvalue(0,0).to_i + : @conn.exec( sql ).getvalue(0,0).to_i @id_n ||=0 rescue puts "#{__FILE__}:#{__LINE__}" if @opt.act[:maintenance][:set]==:on @@ -126,9 +128,16 @@ module SiSU_DbImport if (@opt.act[:verbose][:set]==:on \ || @opt.act[:verbose_plus][:set]==:on \ || @opt.act[:maintenance][:set]==:on) - SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],"#{@db.psql.db}::#{@opt.fns}").puts_blue + SiSU_Screen::Ansi.new( + @opt.act[:color_state][:set], + "#{@db.psql.db}::#{@opt.fns}" + ).puts_blue end - SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Marshal Load',@fnc).puts_grey if @opt.act[:verbose][:set]==:on + SiSU_Screen::Ansi.new( + @opt.act[:color_state][:set], + 'Marshal Load', + @fnc + ).puts_grey if @opt.act[:verbose][:set]==:on #% select_first_match=%{ SELECT metadata_and_text.tid @@ -172,22 +181,6 @@ module SiSU_DbImport end @conn.exec("COMMIT") end - rescue DBI::DatabaseError => e - STDERR.puts "Error code: #{e.err}" - STDERR.puts "Error message: #{e.errstr}" - STDERR.puts "Error SQLSTATE: #{e.state}" - SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do - __LINE__.to_s + ':' + __FILE__ - end - sqlfn="#{@env.processing_path.sql}/#{@md.fnb}.sql" - sql=File.new(sqlfn,'w') - t_d.each {|i| sql.puts i} - p sqlfn - if @opt.act[:maintenance][:set]==:on - puts sql - p @conn.methods.sort - puts "#{__FILE__}:#{__LINE__}" - end rescue SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ @@ -261,11 +254,9 @@ module SiSU_DbImport sql='SELECT MAX(tid) FROM metadata_and_text;' begin @@id_t ||=0 - id_t=if @driver_sqlite3 - @conn.execute( sql ).join.to_i # { |x| id_t=x.join.to_i } - else - @conn.execute( sql ) { |x| x.fetch_all.flatten[0] } - end + id_t=@driver_sqlite3 \ + ? @conn.execute( sql ).join.to_i # { |x| id_t=x.join.to_i } + : @conn.exec( sql ).getvalue(0,0).to_i @@id_t=id_t if id_t rescue puts "#{__FILE__} #{__LINE__}" if @opt.act[:maintenance][:set]==:on |