From 88ed8a0c1376fbe6d45059694ce31db597fde3e9 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 14 Apr 2020 11:10:59 -0400
Subject: ruby 2.7 fix

---
 lib/sisu/db_load_tuple.rb | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'lib/sisu/db_load_tuple.rb')

diff --git a/lib/sisu/db_load_tuple.rb b/lib/sisu/db_load_tuple.rb
index 23496388..d7b8e857 100644
--- a/lib/sisu/db_load_tuple.rb
+++ b/lib/sisu/db_load_tuple.rb
@@ -75,17 +75,12 @@ module SiSU_DbTuple
         "INSERT INTO doc_objects (lid, metadata_tid, lev, lev_an, clean, body, book_idx, ocn, ocnd, ocns, seg, lev0, lev1, lev2, lev3, lev4, lev5, lev6, lev7, t_of, t_is, node, parent, digest_clean, digest_all) " +
         "VALUES (#{@col[:lid]}, #{@col[:tid]}, #{@col[:lev]}, '#{@col[:lev_an]}', '#{@col[:plaintext]}', '#{@col[:body]}', '#{@col[:book_idx]}', '#{@col[:ocn]}', '#{@col[:ocnd]}', '#{@col[:ocns]}', '#{@col[:seg]}', '#{@col[:lv0]}', '#{@col[:lv1]}', '#{@col[:lv2]}', '#{@col[:lv3]}', '#{@col[:lv4]}', '#{@col[:lv5]}', '#{@col[:lv6]}', '#{@col[:lv7]}', '#{@col[:t_of]}', '#{@col[:t_is]}', '#{@col[:node]}', '#{@col[:parent]}', '#{@col[:digest_clean]}', '#{@col[:digest_all]}');"
       end
-      if @opt.act[:verbose_plus][:set]==:on
-        if @opt.act[:maintenance][:set]==:on
+      if @opt.act[:maintenance][:set]==:on
           puts @file_maint.inspect
           puts sql_entry
-        end
-        @file_maint.puts sql_entry
-      else
-        if @opt.act[:verbose_plus][:set]==:on
-          puts sql_entry
           @file_maint.puts sql_entry
-        end
+      elsif @opt.act[:verbose_plus][:set]==:on
+          puts sql_entry
       end
       if @opt.act[:verbose][:set]==:on
         if @col[:lev].inspect =~/[0-35-7]/
@@ -189,7 +184,6 @@ module SiSU_DbTuple
 #{@tp.column.src_word_count.tuple[0]}
 #{@tp.column.src_txt.tuple[0]}
 #{@tp.column.fulltext.tuple[0]}
-#{@tp.column.links.tuple[0]}
 tid)
 " +
        "VALUES (
@@ -269,16 +263,11 @@ tid)
 #{@tp.column.src_word_count.tuple[1]}
 #{@tp.column.src_txt.tuple[1]}
 #{@tp.column.fulltext.tuple[1]}
-#{@tp.column.links.tuple[1]}
 #{@id}
 );"
       if @md.opt.act[:maintenance][:set]==:on
         puts "maintenance mode on: creating sql transaction file (for last transaction set (document) only):\n\t#{@file_maint.inspect}"
         @file_maint.puts sql_entry
-      else
-        if @md.opt.act[:verbose_plus][:set]==:on
-          @file_maint.puts sql_entry
-        end
       end
       sql_entry
     end
@@ -292,10 +281,6 @@ tid)
       "VALUES (#{@u[:txt]} #{@u[:html_toc]} #{@u[:html_doc]} #{@u[:xhtml]} #{@u[:xml_sax]} #{@u[:xml_dom]} #{@u[:odf]} #{@u[:pdf_p]} #{@u[:pdf_l]} #{@u[:concordance]} #{@u[:latex_p]} #{@u[:latex_l]} #{@u[:manifest]} #{@u[:digest]} #{@u[:markup]} #{@u[:sisupod]} #{@id});"
       if @opt.act[:maintenance][:set]==:on
         @file_maint.puts sql_entry
-      else
-        if @opt.act[:verbose_plus][:set]==:on
-          @file_maint.puts sql_entry
-        end
       end
       sql_entry
     end
@@ -309,10 +294,6 @@ tid)
       "VALUES ('#{@en[:id]}', '#{@en[:lid]}', '#{@en[:nr]}', '#{@en[:txt]}', '#{@en[:body]}', '#{@en[:ocn]}', '#{@en[:ocnd]}', '#{@en[:ocns]}', '#{@en[:id_t]}', '#{@en[:hash]}');"
       if @opt.act[:maintenance][:set]==:on
         @file_maint.puts sql_entry
-      else
-        if @opt.act[:verbose_plus][:set]==:on
-          @file_maint.puts sql_entry
-        end
       end
       sql_entry
     end
-- 
cgit v1.2.3