chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-14 17:15:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed res2sqlite to have a main() function

Browse Source
This commit is contained in:
Chris Kerr
2019-03-10 09:21:57 +01:00
parent c77b0a2444
commit e3d9073d02
1 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/res2sqlite.py
View File

@@ -350,7 +350,7 @@ CREATE VIEW IF NOT EXISTS Capacity_View
"""
def mdb_get_data_text(filename, table):
def mdb_get_data_text(s3db, filename, table):
print("Reading %s..." % table)
try:
mdb_sql = sp.Popen(['mdb-export', '-I', 'postgres', filename, table],
@@ -373,7 +373,7 @@ def mdb_get_data_text(filename, table):
mdb_sql.terminate()
def mdb_get_data_numeric(filename, table):
def mdb_get_data_numeric(s3db, filename, table):
print("Reading %s..." % table)
try:
mdb_sql = sp.Popen(['mdb-export', filename, table],
@@ -392,24 +392,21 @@ def mdb_get_data_numeric(filename, table):
mdb_sql.terminate()
def mdb_get_data(filename, table):
def mdb_get_data(s3db, filename, table):
if table in mdb_tables_text:
mdb_get_data_text(filename, table)
mdb_get_data_text(s3db, filename, table)
elif table in mdb_tables_numeric:
mdb_get_data_numeric(filename, table)
mdb_get_data_numeric(s3db, filename, table)
else:
raise ValueError("'%s' is in neither mdb_tables_text nor mdb_tables_numeric" % table)
## Main part of the script
def convert_arbin_to_sqlite(input_file, output_file):
"""Read data from an Arbin .res data file and write to a sqlite file.
parser = argparse.ArgumentParser(description="Convert Arbin .res files to sqlite3 databases using mdb-export")
parser.add_argument('input_file', type=str) # need file name to pass to sp.Popen
parser.add_argument('output_file', type=str) # need file name to pass to sqlite3.connect
args = parser.parse_args()
s3db = sqlite3.connect(args.output_file)
Any data currently in the sqlite file will be erased!
"""
s3db = sqlite3.connect(output_file)
for table in reversed(mdb_tables + mdb_5_23_tables):
@@ -417,7 +414,7 @@ for table in reversed(mdb_tables + mdb_5_23_tables):
for table in mdb_tables:
s3db.executescript(mdb_create_scripts[table])
mdb_get_data(args.input_file, table)
mdb_get_data(s3db, input_file, table)
if table in mdb_create_indices:
print("Creating indices for %s..." % table)
s3db.executescript(mdb_create_indices[table])
@@ -425,7 +422,7 @@ for table in mdb_tables:
if (s3db.execute("SELECT Version_Schema_Field FROM Version_Table;").fetchone()[0] == "Results File 5.23"):
for table in mdb_5_23_tables:
s3db.executescript(mdb_create_scripts[table])
mdb_get_data(args.input_file, table)
mdb_get_data(input_file, table)
if table in mdb_create_indices:
s3db.executescript(mdb_create_indices[table])
@@ -434,3 +431,16 @@ s3db.executescript(helper_table_script)
print("Vacuuming database...")
s3db.executescript("VACUUM; ANALYZE;")
def main(argv=None):
parser = argparse.ArgumentParser(description="Convert Arbin .res files to sqlite3 databases using mdb-export")
parser.add_argument('input_file', type=str) # need file name to pass to sp.Popen
parser.add_argument('output_file', type=str) # need file name to pass to sqlite3.connect
args = parser.parse_args(argv)
convert_arbin_to_sqlite(args.input_file, args.output_file)
if __name__ == '__main__':
main()