From edd89902036bde18c91031470e19c871a182cf6d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 23 Oct 2013 23:40:45 -0400
Subject: v5: options & downstream, more use of opt.act instead of opt.cmd

* opt.act.*.set==:on instead of opt.cmd =~/\S/
---
 lib/sisu/v5/dbi_discrete.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/sisu/v5/dbi_discrete.rb')

diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb
index fe921c85..957009b1 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/v5/dbi_discrete.rb
@@ -79,7 +79,7 @@ module  SiSU_DBI_Discrete                               #% database building
       if @opt.cmd =~/[d]/ \
       or  @opt.mod.inspect =~/--((?:sq)?lite)/
         @sql_type='sqlite'
-        maintenance_check(@opt,__FILE__,__LINE__) if @opt.cmd.inspect =~/M/
+        maintenance_check(@opt,__FILE__,__LINE__) if @opt.act[:maintenance][:set]==:on
       end
       @output_path=@md.file.output_path.sqlite_discrete.dir
       @filename=@md.file.base_filename.sqlite_discrete
@@ -121,7 +121,7 @@ module  SiSU_DBI_Discrete                               #% database building
       sdb_index=SiSU_DbDBI::Index.new(@opt,conn,@file,'sqlite')
       sdb.output_dir?
       begin
-        SiSU_Screen::Ansi.new(@opt.cmd,'SQLite',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").green_title_hi unless @opt.cmd =~/q/
+        SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'SQLite',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").green_title_hi unless @opt.act[:quiet][:set]==:on
         sdb.create_db
         sdb.create_table.metadata_and_text
         sdb.create_table.doc_objects
@@ -133,8 +133,8 @@ module  SiSU_DBI_Discrete                               #% database building
         db_exist?(db,conn)
         sdb_import=SiSU_DbDBI::Import.new(@opt,conn,@file_maint,'sqlite')
         sdb_import.marshal_load
-        tell=SiSU_Screen::Ansi.new(@opt.cmd,"sqlite3 #{db.sqlite.db} database?")
-        tell.puts_grey if @opt.cmd =~/v/
+        tell=SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],"sqlite3 #{db.sqlite.db} database?")
+        tell.puts_grey if @opt.act[:verbose][:set]==:on
       rescue
         SiSU_Errors::Rescued.new($!,$@,'-d').location do
           __LINE__.to_s + ':' + __FILE__
@@ -151,7 +151,7 @@ module  SiSU_DBI_Discrete                               #% database building
     end
     def connect
       begin
-        SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.cmd =~/q/
+        SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.act[:quiet][:set]==:on
         @db.sqlite_discrete.conn_sqlite3
       rescue
         SiSU_Errors::Rescued.new($!,$@,@cf,@opt.fns).location do
@@ -166,7 +166,7 @@ module  SiSU_DBI_Discrete                               #% database building
       file=if @opt.inspect =~/M/
         if @opt.fns and not @opt.fns.empty?
           @env=SiSU_Env::InfoEnv.new(@opt.fns) if @opt.fns
-          puts "\n#{@env.processing_path.sqlite}/#{@opt.fns}.sql" if @sql_type =~/sqlite/ and @opt.cmd =~/M/
+          puts "\n#{@env.processing_path.sqlite}/#{@opt.fns}.sql" if @sql_type =~/sqlite/ and @opt.act[:maintenance][:set]==:on
           @db=SiSU_Env::InfoDb.new
           @job="sqlite3 #{@db.sqlite.db} < #{@env.processing_path.sqlite}/#{@opt.fns}.sql"
           File.new("#{@env.processing_path.sqlite}/#{@opt.fns}.sql",'w+')
-- 
cgit v1.2.3