v4 (v3): dbi_discrete, discreet should have been discrete, renames accordingly

12 files changed, 67 insertions, 67 deletions

diff --git a/lib/sisu/v3/dbi_discreet.rb b/lib/sisu/v3/dbi_discrete.rb
index e26e119c..f670cb27 100644
--- a/lib/sisu/v3/dbi_discreet.rb
+++ b/lib/sisu/v3/dbi_discrete.rb
@@ -55,7 +55,7 @@
  ** Description: postgresql module, dbi import frame
 
 =end
-module  SiSU_DBI_Discreet                               #% database building
+module  SiSU_DBI_Discrete                               #% database building
   require_relative 'help'                               # help.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env; include SiSU_Screen
@@ -78,8 +78,8 @@ module  SiSU_DBI_Discreet                               #% database building
         @sql_type='sqlite'
         maintenance_check(@opt,__FILE__,__LINE__) if @opt.cmd.inspect =~/M/
       end
-      @output_path=@md.file.output_path.sqlite_discreet.dir
-      @filename=@md.file.base_filename.sqlite_discreet
+      @output_path=@md.file.output_path.sqlite_discrete.dir
+      @filename=@md.file.base_filename.sqlite_discrete
       @file_maint=sql_maintenance_file
       @file="#{@output_path}/#{@filename}"
     end
@@ -113,7 +113,7 @@ module  SiSU_DBI_Discreet                               #% database building
     end
     def create_and_populate
       db=SiSU_Env::DbOp.new(@md)
-      conn=db.sqlite_discreet.conn_sqlite3
+      conn=db.sqlite_discrete.conn_sqlite3
       sdb=SiSU_DbDBI::Create.new(@opt,conn,@file,'sqlite')
       sdb_index=SiSU_DbDBI::Index.new(@opt,conn,@file,'sqlite')
       sdb.output_dir?
@@ -150,7 +150,7 @@ module  SiSU_DBI_Discreet                               #% database building
       begin
         sql_type='sqlite'
         SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.cmd =~/q/
-        @db.sqlite_discreet.conn_sqlite3
+        @db.sqlite_discrete.conn_sqlite3
       rescue
         SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error do
           __LINE__.to_s + ':' + __FILE__
diff --git a/lib/sisu/v3/hub.rb b/lib/sisu/v3/hub.rb
index 73155047..4ab701bb 100644
--- a/lib/sisu/v3/hub.rb
+++ b/lib/sisu/v3/hub.rb
@@ -340,9 +340,9 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
           require_relative 'texinfo'                   # -I     texinfo.rb
           SiSU_TexInfo::Source.new(@opt).read
         end
-        if @opt.act[:sqlite_discreet][:set]==:on       #% --sqlite, -d DB sqlite
-          require_relative 'dbi_discreet'              # -d     dbi_discreet.rb
-          SiSU_DBI_Discreet::SQL.new(@opt).build
+        if @opt.act[:sqlite_discrete][:set]==:on       #% --sqlite, -d DB sqlite
+          require_relative 'dbi_discrete'              # -d     dbi_discrete.rb
+          SiSU_DBI_Discrete::SQL.new(@opt).build
         end
         if @opt.act[:manifest][:set]==:on              #% --manifest, -y
           require_relative 'manifest'                  # -y     manifest.rb
diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb
index 58bc60d5..19c000aa 100644
--- a/lib/sisu/v3/manifest.rb
+++ b/lib/sisu/v3/manifest.rb
@@ -398,11 +398,11 @@ module SiSU_Manifest
           id,file='Manpage',@f.base_filename.manpage
           summarize(id,file,pth,rel,url)
         end
-        if FileTest.file?(@f.place_file.sqlite_discreet.dir)==true
-          id,file='SQLite3 file',@f.base_filename.sqlite_discreet
-          pth=@f.output_path.sqlite_discreet.dir
-          rel=@f.output_path.sqlite_discreet.rel_sm
-          url=@f.output_path.sqlite_discreet.url
+        if FileTest.file?(@f.place_file.sqlite_discrete.dir)==true
+          id,file='SQLite3 file',@f.base_filename.sqlite_discrete
+          pth=@f.output_path.sqlite_discrete.dir
+          rel=@f.output_path.sqlite_discrete.rel_sm
+          url=@f.output_path.sqlite_discrete.url
           summarize(id,file,pth,rel,url)
         end
         if FileTest.file?(@f.place_file.txt.dir)==true
diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb
index 444d94bc..0d6c2481 100644
--- a/lib/sisu/v3/options.rb
+++ b/lib/sisu/v3/options.rb
@@ -722,7 +722,7 @@ module SiSU_Commandline
         && (mod.inspect =~/"--createdb"|"--create(?:all)?"|"--dropall"|"--recreate(?:all)?"|"--import"|"--update"|"--remove"/) \
         ? { bool: true, set: :on }
         : { bool: false, set: :na }
-        act[:sqlite_discreet]=(cmd =~/d/ \
+        act[:sqlite_discrete]=(cmd =~/d/ \
         || mod.inspect =~/"--sql"|"--sqlite"/) \
         && (mod.inspect =~/"--both"/ \
         || mod.inspect !~/"--createdb"|"--create(?:all)?"|"--dropall"|"--recreate(?:all)?"|"--import"|"--update"|"--remove"/) \
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 8ed17f88..2255cc4f 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -3249,10 +3249,10 @@ WOK
             || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/)
               inp << @f.output_path.pdf.rel + '/' + @opt.fnb + '*'
             end
-            if (@opt.act[:sqlite_discreet][:set]==:on \
+            if (@opt.act[:sqlite_discrete][:set]==:on \
             || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
-            && FileTest.file?(@f.place_file.sqlite_discreet.dir)
-              inp << @f.place_file.sqlite_discreet.rel
+            && FileTest.file?(@f.place_file.sqlite_discrete.dir)
+              inp << @f.place_file.sqlite_discrete.rel
             end
             if (@opt.act[:qrcode][:set]==:on \
             || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
@@ -3903,7 +3903,7 @@ WOK
       def db
         "#{@env.path.webserv}/#{@pwd_stub}/sisu_sqlite.db"
       end
-      def db_discreet(md)
+      def db_discrete(md)
         # "#{@env.path.webserv}/#{@pwd_stub}/sisu_sqlite.db"
       end
       def dbi
@@ -3932,21 +3932,21 @@ WOK
       ensure
       end
     end
-    def sqlite_discreet
+    def sqlite_discrete
       def db
-        "#{@md.file.output_path.sqlite_discreet.dir}/#{@md.file.base_filename.sqlite_discreet}"
+        "#{@md.file.output_path.sqlite_discrete.dir}/#{@md.file.base_filename.sqlite_discrete}"
       end
       def dbi
-        "DBI:SQLite3:#{sqlite_discreet.db}"
+        "DBI:SQLite3:#{sqlite_discrete.db}"
       end
       def sqlite3
-        sqlite_discreet.db
+        sqlite_discrete.db
       end
       def conn_dbi
-        DBI.connect(sqlite_discreet.dbi)
+        DBI.connect(sqlite_discrete.dbi)
       end
       def conn_sqlite3
-        SQLite3::Database.new(sqlite_discreet.sqlite3)
+        SQLite3::Database.new(sqlite_discrete.sqlite3)
       end
       self
     end
@@ -4295,12 +4295,12 @@ WOK
         end
         self
       end
-      def sqlite_discreet
+      def sqlite_discrete
         def dir
-          output_path.sqlite_discreet.dir + '/' + base_filename.sqlite_discreet
+          output_path.sqlite_discrete.dir + '/' + base_filename.sqlite_discrete
         end
         def rel
-          output_path.sqlite_discreet.rel + '/' + base_filename.sqlite_discreet
+          output_path.sqlite_discrete.rel + '/' + base_filename.sqlite_discrete
         end
         self
       end
@@ -4594,7 +4594,7 @@ WOK
           @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft
         end
       end
-      def sqlite_discreet
+      def sqlite_discrete
         ft='.sql.db'
         if output_dir_structure.by_language_code?
           @md.fnb + ft
@@ -5244,7 +5244,7 @@ WOK
         end
         self
       end
-      def sqlite_discreet
+      def sqlite_discrete
         def ft
          'sql'
         end
diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb
index a9a27bff..d2dac6da 100644
--- a/lib/sisu/v3/urls.rb
+++ b/lib/sisu/v3/urls.rb
@@ -220,8 +220,8 @@ module SiSU_Urls
         def sqlite(x,y)
           SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x} DBI sqlite","sqlite3 #{@env.path.webserv}/#{@md.opt.f_pth[:pth_stub]}/sisu_sqlite.db").result
         end
-        def sqlite_discreet(x,y)
-          SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","sqlite3 #{@md.file.output_path.sqlite_discreet.dir}/#{@md.file.base_filename.sqlite_discreet}").result
+        def sqlite_discrete(x,y)
+          SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","sqlite3 #{@md.file.output_path.sqlite_discrete.dir}/#{@md.file.base_filename.sqlite_discrete}").result
         end
         self
       end
@@ -304,8 +304,8 @@ module SiSU_Urls
                 show.db.psql(x,y)
               end
               if x=~/d\s+--sqlite\b|--sql\b/ \
-              and @opt.act[:sqlite_discreet][:set]==:on
-                show.db.sqlite_discreet(x,y)
+              and @opt.act[:sqlite_discrete][:set]==:on
+                show.db.sqlite_discrete(x,y)
               end
               if x=~/d\[iu\]\s+--sqlite\b/ \
               and @opt.act[:sqlite][:set]==:on
diff --git a/lib/sisu/v4/dbi_discreet.rb b/lib/sisu/v4/dbi_discrete.rb
index e26e119c..f670cb27 100644
--- a/lib/sisu/v4/dbi_discreet.rb
+++ b/lib/sisu/v4/dbi_discrete.rb
@@ -55,7 +55,7 @@
  ** Description: postgresql module, dbi import frame
 
 =end
-module  SiSU_DBI_Discreet                               #% database building
+module  SiSU_DBI_Discrete                               #% database building
   require_relative 'help'                               # help.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env; include SiSU_Screen
@@ -78,8 +78,8 @@ module  SiSU_DBI_Discreet                               #% database building
         @sql_type='sqlite'
         maintenance_check(@opt,__FILE__,__LINE__) if @opt.cmd.inspect =~/M/
       end
-      @output_path=@md.file.output_path.sqlite_discreet.dir
-      @filename=@md.file.base_filename.sqlite_discreet
+      @output_path=@md.file.output_path.sqlite_discrete.dir
+      @filename=@md.file.base_filename.sqlite_discrete
       @file_maint=sql_maintenance_file
       @file="#{@output_path}/#{@filename}"
     end
@@ -113,7 +113,7 @@ module  SiSU_DBI_Discreet                               #% database building
     end
     def create_and_populate
       db=SiSU_Env::DbOp.new(@md)
-      conn=db.sqlite_discreet.conn_sqlite3
+      conn=db.sqlite_discrete.conn_sqlite3
       sdb=SiSU_DbDBI::Create.new(@opt,conn,@file,'sqlite')
       sdb_index=SiSU_DbDBI::Index.new(@opt,conn,@file,'sqlite')
       sdb.output_dir?
@@ -150,7 +150,7 @@ module  SiSU_DBI_Discreet                               #% database building
       begin
         sql_type='sqlite'
         SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.cmd =~/q/
-        @db.sqlite_discreet.conn_sqlite3
+        @db.sqlite_discrete.conn_sqlite3
       rescue
         SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error do
           __LINE__.to_s + ':' + __FILE__
diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index ccae2b9f..8cd0358f 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -353,9 +353,9 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
           require_relative 'texinfo'                   # -I     texinfo.rb
           SiSU_TexInfo::Source.new(@opt).read
         end
-        if @opt.act[:sqlite_discreet][:set]==:on       #% --sqlite, -d DB sqlite
-          require_relative 'dbi_discreet'              # -d     dbi_discreet.rb
-          SiSU_DBI_Discreet::SQL.new(@opt).build
+        if @opt.act[:sqlite_discrete][:set]==:on       #% --sqlite, -d DB sqlite
+          require_relative 'dbi_discrete'              # -d dbi_discrete.rb
+          SiSU_DBI_Discrete::SQL.new(@opt).build
         end
         if @opt.act[:manifest][:set]==:on              #% --manifest, -y
           require_relative 'manifest'                  # -y     manifest.rb
@@ -659,7 +659,7 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
       or @opt.act[:pdf_l][:set]==:on \
       or @opt.act[:psql][:set]==:on \
       or @opt.act[:sqlite][:set]==:on \
-      or @opt.act[:sqlite_discreet][:set]==:on \
+      or @opt.act[:sqlite_discrete][:set]==:on \
       or @opt.act[:share_source][:set]==:on \
       or @opt.act[:sisupod][:set]==:on \
       or @opt.act[:qrcode][:set]==:on \
diff --git a/lib/sisu/v4/manifest.rb b/lib/sisu/v4/manifest.rb
index d52d9f43..89b7aac4 100644
--- a/lib/sisu/v4/manifest.rb
+++ b/lib/sisu/v4/manifest.rb
@@ -397,11 +397,11 @@ module SiSU_Manifest
           id,file='Manpage',@f.base_filename.manpage
           summarize(id,file,pth,rel,url)
         end
-        if FileTest.file?(@f.place_file.sqlite_discreet.dir)==true
-          id,file='SQLite3 file',@f.base_filename.sqlite_discreet
-          pth=@f.output_path.sqlite_discreet.dir
-          rel=@f.output_path.sqlite_discreet.rel_sm
-          url=@f.output_path.sqlite_discreet.url
+        if FileTest.file?(@f.place_file.sqlite_discrete.dir)==true
+          id,file='SQLite3 file',@f.base_filename.sqlite_discrete
+          pth=@f.output_path.sqlite_discrete.dir
+          rel=@f.output_path.sqlite_discrete.rel_sm
+          url=@f.output_path.sqlite_discrete.url
           summarize(id,file,pth,rel,url)
         end
         if FileTest.file?(@f.place_file.txt.dir)==true
diff --git a/lib/sisu/v4/options.rb b/lib/sisu/v4/options.rb
index 3dca5253..068174c4 100644
--- a/lib/sisu/v4/options.rb
+++ b/lib/sisu/v4/options.rb
@@ -919,7 +919,7 @@ module SiSU_Commandline
         && (mod.inspect =~/"--createdb"|"--create(?:all)?"|"--dropall"|"--recreate(?:all)?"|"--import"|"--update"|"--remove"/) \
         ? { bool: true, set: :on }
         : { bool: false, set: :na }
-        act[:sqlite_discreet]=(cmd =~/d/ \
+        act[:sqlite_discrete]=(cmd =~/d/ \
         || mod.inspect =~/"--sql"|"--sqlite"/) \
         && (mod.inspect =~/"--both"/ \
         || mod.inspect !~/"--createdb"|"--create(?:all)?"|"--dropall"|"--recreate(?:all)?"|"--import"|"--update"|"--remove"/) \
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index 728f4fc4..07184b34 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -3340,10 +3340,10 @@ WOK
             || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/)
               inp << @f.output_path.pdf.rel + '/' + @opt.fnb + '*'
             end
-            if (@opt.act[:sqlite_discreet][:set]==:on \
+            if (@opt.act[:sqlite_discrete][:set]==:on \
             || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
-            && FileTest.file?(@f.place_file.sqlite_discreet.dir)
-              inp << @f.place_file.sqlite_discreet.rel
+            && FileTest.file?(@f.place_file.sqlite_discrete.dir)
+              inp << @f.place_file.sqlite_discrete.rel
             end
             if (@opt.act[:qrcode][:set]==:on \
             || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
@@ -4010,7 +4010,7 @@ WOK
       def db
         "#{@env.path.webserv}/#{@pwd_stub}/sisu_sqlite.db"
       end
-      def db_discreet(md)
+      def db_discrete(md)
         # "#{@env.path.webserv}/#{@pwd_stub}/sisu_sqlite.db"
       end
       def dbi
@@ -4039,21 +4039,21 @@ WOK
       ensure
       end
     end
-    def sqlite_discreet
+    def sqlite_discrete
       def db
-        "#{@md.file.output_path.sqlite_discreet.dir}/#{@md.file.base_filename.sqlite_discreet}"
+        "#{@md.file.output_path.sqlite_discrete.dir}/#{@md.file.base_filename.sqlite_discrete}"
       end
       def dbi
-        "DBI:SQLite3:#{sqlite_discreet.db}"
+        "DBI:SQLite3:#{sqlite_discrete.db}"
       end
       def sqlite3
-        sqlite_discreet.db
+        sqlite_discrete.db
       end
       def conn_dbi
-        DBI.connect(sqlite_discreet.dbi)
+        DBI.connect(sqlite_discrete.dbi)
       end
       def conn_sqlite3
-        SQLite3::Database.new(sqlite_discreet.sqlite3)
+        SQLite3::Database.new(sqlite_discrete.sqlite3)
       end
       self
     end
@@ -4402,12 +4402,12 @@ WOK
         end
         self
       end
-      def sqlite_discreet
+      def sqlite_discrete
         def dir
-          output_path.sqlite_discreet.dir + '/' + base_filename.sqlite_discreet
+          output_path.sqlite_discrete.dir + '/' + base_filename.sqlite_discrete
         end
         def rel
-          output_path.sqlite_discreet.rel + '/' + base_filename.sqlite_discreet
+          output_path.sqlite_discrete.rel + '/' + base_filename.sqlite_discrete
         end
         self
       end
@@ -4701,7 +4701,7 @@ WOK
           @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft
         end
       end
-      def sqlite_discreet
+      def sqlite_discrete
         ft='.sql.db'
         if output_dir_structure.by_language_code?
           @md.fnb + ft
@@ -5351,7 +5351,7 @@ WOK
         end
         self
       end
-      def sqlite_discreet
+      def sqlite_discrete
         def ft
          'sql'
         end
diff --git a/lib/sisu/v4/urls.rb b/lib/sisu/v4/urls.rb
index e3671dcd..2e3e2188 100644
--- a/lib/sisu/v4/urls.rb
+++ b/lib/sisu/v4/urls.rb
@@ -220,8 +220,8 @@ module SiSU_Urls
         def sqlite(x,y)
           SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x} DBI sqlite","sqlite3 #{@env.path.webserv}/#{@md.opt.f_pth[:pth_stub]}/sisu_sqlite.db").result
         end
-        def sqlite_discreet(x,y)
-          SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","sqlite3 #{@md.file.output_path.sqlite_discreet.dir}/#{@md.file.base_filename.sqlite_discreet}").result
+        def sqlite_discrete(x,y)
+          SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","sqlite3 #{@md.file.output_path.sqlite_discrete.dir}/#{@md.file.base_filename.sqlite_discrete}").result
         end
         self
       end
@@ -304,8 +304,8 @@ module SiSU_Urls
                 show.db.psql(x,y)
               end
               if x=~/d\s+--sqlite\b|--sql\b/ \
-              and @opt.act[:sqlite_discreet][:set]==:on
-                show.db.sqlite_discreet(x,y)
+              and @opt.act[:sqlite_discrete][:set]==:on
+                show.db.sqlite_discrete(x,y)
               end
               if x=~/d\[iu\]\s+--sqlite\b/ \
               and @opt.act[:sqlite][:set]==:on