v5: options & downstream, more use of opt.act instead of opt.cmd

* opt.act.*.set==:on instead of opt.cmd =~/\S/

1 files changed, 17 insertions, 11 deletions

diff --git a/lib/sisu/v5/db_load_tuple.rb b/lib/sisu/v5/db_load_tuple.rb
index bdaf285a..10282bdd 100644
--- a/lib/sisu/v5/db_load_tuple.rb
+++ b/lib/sisu/v5/db_load_tuple.rb
@@ -78,7 +78,7 @@ module SiSU_DbTuple
         @col[:lev]=0
       end
       @col[:ocn]=0 unless @col[:ocn].inspect=~/\d+/
-      @cX=SiSU_Screen::Ansi.new(@opt.cmd).cX
+      @cX=SiSU_Screen::Ansi.new(@opt.act[:color_state][:set]).cX
     end
     def tuple                                                                    #% import line
       sql_entry=if @col[:en_a]
@@ -88,19 +88,19 @@ module SiSU_DbTuple
         "INSERT INTO doc_objects (lid, metadata_tid, lev, lev_an, clean, body, book_idx, ocn, ocnd, ocns, seg, lev1, lev2, lev3, lev4, lev5, lev6, 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[:lv1]}', '#{@col[:lv2]}', '#{@col[:lv3]}', '#{@col[:lv4]}', '#{@col[:lv5]}', '#{@col[:lv6]}', '#{@col[:t_of]}', '#{@col[:t_is]}', '#{@col[:node]}', '#{@col[:parent]}', '#{@col[:digest_clean]}', '#{@col[:digest_all]}');"
       end
-      if @opt.cmd =~/M/
-        if @opt.cmd =~/V/
+      if @opt.act[:verbose_plus][:set]==:on
+        if @opt.act[:maintenance][:set]==:on
           puts @file_maint.inspect
           puts sql_entry
         end
         @file_maint.puts sql_entry
       else
-        if @opt.cmd =~/V/
+        if @opt.act[:verbose_plus][:set]==:on
           puts sql_entry
           @file_maint.puts sql_entry
         end
       end
-      if @opt.cmd =~/v/
+      if @opt.act[:verbose][:set]==:on
         if @col[:lev].inspect =~/[12356789]/
           lev=case @col[:lev].inspect
           when /1/; ':A'
@@ -283,11 +283,13 @@ tid)
 #{@tp.column.links.tuple[1]}
 #{@id}
 );"
-      if @md.opt.cmd =~/M/
+      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
-        @file_maint.puts sql_entry if @md.opt.cmd =~/V/
+        if @md.opt.act[:verbose_plus][:set]==:on
+          @file_maint.puts sql_entry
+        end
       end
       sql_entry
     end
@@ -299,10 +301,12 @@ tid)
     def tuple
       sql_entry="INSERT INTO urls (#{@f[:txt]} #{@f[:html_toc]} #{@f[:html_doc]} #{@f[:xhtml]} #{@f[:xml_sax]} #{@f[:xml_dom]} #{@f[:odf]} #{@f[:pdf_p]} #{@f[:pdf_l]} #{@f[:concordance]} #{@f[:latex_p]} #{@f[:latex_l]} #{@f[:manifest]} #{@f[:digest]} #{@f[:markup]} #{@f[:sisupod]} metadata_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.cmd =~/M/
+      if @opt.act[:maintenance][:set]==:on
         @file_maint.puts sql_entry
       else
-        @file_maint.puts sql_entry if @opt.cmd =~/V/
+        if @opt.act[:verbose_plus][:set]==:on
+          @file_maint.puts sql_entry
+        end
       end
       sql_entry
     end
@@ -314,10 +318,12 @@ tid)
     def tuple
       sql_entry="INSERT INTO #{@en[:type]} (nid, document_lid, nr, clean, body, ocn, ocnd, ocns, metadata_tid, digest_clean) " +
       "VALUES ('#{@en[:id]}', '#{@en[:lid]}', '#{@en[:nr]}', '#{@en[:txt]}', '#{@en[:body]}', '#{@en[:ocn]}', '#{@en[:ocnd]}', '#{@en[:ocns]}', '#{@en[:id_t]}', '#{@en[:hash]}');"
-      if @opt.cmd =~/M/
+      if @opt.act[:maintenance][:set]==:on
         @file_maint.puts sql_entry
       else
-        @file_maint.puts sql_entry if @opt.cmd =~/V/
+        if @opt.act[:verbose_plus][:set]==:on
+          @file_maint.puts sql_entry
+        end
       end
       sql_entry
     end