diff options
Diffstat (limited to 'lib/sisu/v6/db_import.rb')
-rw-r--r-- | lib/sisu/v6/db_import.rb | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/lib/sisu/v6/db_import.rb b/lib/sisu/v6/db_import.rb index cca02edf..51eb5562 100644 --- a/lib/sisu/v6/db_import.rb +++ b/lib/sisu/v6/db_import.rb @@ -69,6 +69,7 @@ module SiSU_DbImport class Import < SiSU_DbText::Prepare include SiSU_Param include SiSU_Screen + include SiSU_DbAction @@dl=nil @@hname=nil attr_accessor :tp @@ -156,17 +157,11 @@ module SiSU_DbImport + '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 @@ -195,17 +190,11 @@ module SiSU_DbImport + '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 retry end end |