From b367d04c57b21c0a9e2da22e8b20404de076768d Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Thu, 7 Jul 2022 13:07:55 +0300 Subject: Add filetype details to database update code The filetype determines the queries to be run to update the database, therefore, this commit adds filetype information. --- qc_app/dbinsert.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'qc_app/dbinsert.py') diff --git a/qc_app/dbinsert.py b/qc_app/dbinsert.py index 5381fb5..fac546b 100644 --- a/qc_app/dbinsert.py +++ b/qc_app/dbinsert.py @@ -81,7 +81,8 @@ def select_dataset(): types=group_types, datasets=datasets, menu_contents=json.dumps(menu_contents), genechips_data=json.dumps(gchips), - genechips=gchips.get(default_species, [])) + genechips=gchips.get(default_species, []), + filetype=job["filetype"]) return render_error(f"File '{filename}' no longer exists.") return render_error(f"Job '{job_id}' no longer exists.") return render_error("Unknown error") @@ -95,10 +96,13 @@ def insert_data(): filepath = f"{app.config['UPLOAD_FOLDER']}/{filename}" if os.path.exists(filepath): try: - dataset_id = int(form["dataset"]) - return (f"Would insert data in file '{filepath}' " - "into the database with the dataset " - f"{dataset_id}") + species = form["species"] + filetype = form["filetype"] + datasetid = int(form["dataset"]) + genechipid = int(form["genechipid"]) + return (f"Would insert '{species}' data in '{filetype}' file " + f"'{filepath}' into the database with the dataset " + f"'{datasetid}' and genechip '{genechipid}'.") except ValueError as ve: msg = "::".join(ve.args) return render_error(f"Invalid value: {msg}") -- cgit v1.2.3