From 96049bf591123333b8a17780544a7951146ef03b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 26 Oct 2007 22:41:42 +0100
Subject: db rearranging, create, drop, import (and a renaming: db_dbi from
 shared_db)

---
 lib/sisu/v0/db_select.rb | 66 ++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'lib/sisu/v0/db_select.rb')

diff --git a/lib/sisu/v0/db_select.rb b/lib/sisu/v0/db_select.rb
index acf4356f..8471bde9 100644
--- a/lib/sisu/v0/db_select.rb
+++ b/lib/sisu/v0/db_select.rb
@@ -60,11 +60,11 @@ module SiSU_DB_select
     def initialize(opt,conn='',sql_type='pg')
       @opt,@conn,@sql_type=opt,conn,sql_type
       #@sdb=Create.new(@conn)
-      @sdb=SiSU_DB::Create.new(@opt,@conn,@sql_type)
-      @index=SiSU_DB::Index.new(@opt,@conn,@sql_type)
-      @sdb_no=SiSU_DB::Drop.new(@opt,@conn,@sql_type)
-      @sdb_import=SiSU_DB::Import.new(@opt,@conn,@sql_type) if @opt.mod.inspect =~/update|import/
-      @remove=SiSU_DB::Remove.new(@opt,@conn) if @opt.mod.inspect =~/update|remove/
+      @sdb=SiSU_DB_DBI::Create.new(@opt,@conn,@sql_type)
+      @index=SiSU_DB_DBI::Index.new(@opt,@conn,@sql_type)
+      @sdb_no=SiSU_DB_DBI::Drop.new(@opt,@conn,@sql_type)
+      @sdb_import=SiSU_DB_DBI::Import.new(@opt,@conn,@sql_type) if @opt.mod.inspect =~/update|import/
+      @remove=SiSU_DB_DBI::Remove.new(@opt,@conn) if @opt.mod.inspect =~/update|remove/
       @db=SiSU_Env::Info_db.new
     end
     def cases
@@ -80,57 +80,57 @@ module SiSU_DB_select
           @sdb.output_dir?
           #@sdb.create_db
           begin
-          @sdb.create_table_metadata
-          @sdb.create_table
-          @sdb.create_table_endnotes
-          @sdb.create_table_endnotes_asterisk
-          @sdb.create_table_endnotes_plus
-          @sdb.create_table_urls
+          @sdb.create_table.metadata
+          @sdb.create_table.documents
+          @sdb.create_table.endnotes
+          @sdb.create_table.endnotes_asterisk
+          @sdb.create_table.endnotes_plus
+          @sdb.create_table.urls
           @index.create_indexes
           rescue;  SiSU_Errors::Info_error.new($!,$@,'-D').error; @sdb.output_dir?
           end
         when /^--createtable(s)?$/
           @sdb.output_dir?
           begin
-          @sdb.create_table_metadata
-          @sdb.create_table
-          @sdb.create_table_endnotes
-          @sdb.create_table_endnotes_asterisk
-          @sdb.create_table_endnotes_plus
-          @sdb.create_table_urls
+          @sdb.create_table.metadata
+          @sdb.create_table.documents
+          @sdb.create_table.endnotes
+          @sdb.create_table.endnotes_asterisk
+          @sdb.create_table.endnotes_plus
+          @sdb.create_table.urls
           @index.create_indexes
           rescue; @sdb.output_dir?
           end
         when /^--recreate$/
           @sdb.output_dir?
           begin
-          @sdb_no.drop_tables
-          @sdb.create_table_metadata
-          @sdb.create_table
-          @sdb.create_table_endnotes
-          @sdb.create_table_endnotes_asterisk
-          @sdb.create_table_endnotes_plus
-          @sdb.create_table_urls
+          @sdb_no.drop.tables
+          @sdb.create_table.metadata
+          @sdb.create_table.documents
+          @sdb.create_table.endnotes
+          @sdb.create_table.endnotes_asterisk
+          @sdb.create_table.endnotes_plus
+          @sdb.create_table.urls
           @index.create_indexes
           rescue; @sdb.output_dir?
           end
         when /^--cr(eate)?lex$/
           @sdb.output_dir?
           begin
-          @sdb.create_table
+          @sdb.create_table.documents
           rescue; @sdb.output_dir?
           end
         when /^--cr(eate)?metadata$/
           @sdb.output_dir?
           begin
-          @sdb.create_table_metadata
+          @sdb.create_table.metadata
           rescue; @sdb.output_dir?
           end
         when /^--import$/
           @sdb_import.marshal_load
           tell=case @sql_type
-          when /sqlite/; SiSU_Screen::Ansi.new(@opt.cmd,"sqlite #{@db.db_sqlite} database?")
-          when /pg/;     SiSU_Screen::Ansi.new(@opt.cmd,"pgaccess or psql #{@db.db_psql} database?")
+          when /sqlite/; SiSU_Screen::Ansi.new(@opt.cmd,"sqlite #{@db.sqlite.db} database?")
+          when /pg/;     SiSU_Screen::Ansi.new(@opt.cmd,"pgaccess or psql #{@db.psql.db} database?")
           else '???'
           end
           tell.puts_grey if @opt.cmd =~/v/
@@ -139,17 +139,17 @@ module SiSU_DB_select
         when /^--update$/
           @remove.remove
           @sdb_import.marshal_load
-          tell=SiSU_Screen::Ansi.new(@opt.cmd,"pgaccess or psql #{@db.db_psql} database?")
+          tell=SiSU_Screen::Ansi.new(@opt.cmd,"pgaccess or psql #{@db.psql.db} database?")
           tell.puts_grey if @opt.cmd =~/v/
         when /^--index$/
           @index.create_indexes
         when /^droptable(s)?$/
-          @sdb_no.drop_tables
+          @sdb_no.drop.tables
         when /^--dropindex(es)?$/
-          @sdb_no.drop_indexes
+          @sdb_no.drop.indexes
         when /^--(?:dropall|drop)$/
-          @sdb_no.drop_tables
-          #@sdb_no.drop_indexes
+          @sdb_no.drop.tables
+          #@sdb_no.drop.indexes
         when /^--(?:db=)?(?:(?:sq)?lite|pg(?:sql)?|my(?:sql)?)$/
         else
           help=SiSU_Help::Help.new
-- 
cgit v1.2.3