From c59e0eedb91790f90cfa0a314834153660556f28 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 23 Jul 2014 18:13:36 -0400 Subject: v5 v6: db, reorganize previous commit --- lib/sisu/v5/db_remove.rb | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'lib/sisu/v5/db_remove.rb') diff --git a/lib/sisu/v5/db_remove.rb b/lib/sisu/v5/db_remove.rb index 7075780e..cff42409 100644 --- a/lib/sisu/v5/db_remove.rb +++ b/lib/sisu/v5/db_remove.rb @@ -63,6 +63,7 @@ =end module SiSU_DbRemove class Remove + include SiSU_DbAction def initialize(opt,conn,file,sql_type) @opt,@conn,@file,@sql_type=opt,conn,file,sql_type @md=SiSU_Param::Parameters.new(@opt).get @@ -93,17 +94,11 @@ module SiSU_DbRemove + 'Attempting to initialize db' + "\n" \ + 'Creating db tables' ) - sdb= - SiSU_DbDBI::Create.new(@opt,@conn,@file_maint,@sql_type) - sdb_index= - SiSU_DbDBI::Index.new(@opt,@conn,@file_maint,@sql_type) - sdb.create_table.metadata_and_text - sdb.create_table.doc_objects - sdb.create_table.endnotes - sdb.create_table.endnotes_asterisk - sdb.create_table.endnotes_plus - sdb.create_table.urls - sdb_index.create_indexes + sdb={ + create: SiSU_DbDBI::Create.new(@opt,@conn,@file_maint,@sql_type), + index: SiSU_DbDBI::Index.new(@opt,@conn,@file_maint,@sql_type), + } + db_action(sdb).create end else begin @@ -139,17 +134,11 @@ module SiSU_DbRemove + 'Attempting to initialize db' + "\n" \ + 'Creating db tables' ) - sdb= - SiSU_DbDBI::Create.new(@opt,@conn,@file_maint,@sql_type) - sdb_index= - SiSU_DbDBI::Index.new(@opt,@conn,@file_maint,@sql_type) - sdb.create_table.metadata_and_text - sdb.create_table.doc_objects - sdb.create_table.endnotes - sdb.create_table.endnotes_asterisk - sdb.create_table.endnotes_plus - sdb.create_table.urls - sdb_index.create_indexes + sdb={ + create: SiSU_DbDBI::Create.new(@opt,@conn,@file_maint,@sql_type), + index: SiSU_DbDBI::Index.new(@opt,@conn,@file_maint,@sql_type), + } + db_action(sdb).create end end end -- cgit v1.2.3