diff options
Diffstat (limited to 'uploader')
| -rw-r--r-- | uploader/phenotypes/models.py | 10 | ||||
| -rw-r--r-- | uploader/phenotypes/views.py | 5 | ||||
| -rw-r--r-- | uploader/templates/samples/upload-samples.html | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/uploader/phenotypes/models.py b/uploader/phenotypes/models.py index c2aeebf..45fcd30 100644 --- a/uploader/phenotypes/models.py +++ b/uploader/phenotypes/models.py @@ -314,9 +314,13 @@ def create_new_phenotypes(conn: mdb.Connection, cursor.executemany( ("INSERT INTO " - "Phenotype(Pre_publication_description, Original_description, Units, Authorized_Users) " - "VALUES (%s, %s, %s, 'robwilliams')"), - tuple((row["id"], row["description"], row["units"]) + "Phenotype(" + "Pre_publication_description, Post_publication_description, " + "Original_description, Units, Pre_publication_abbreviation, " + "Post_publication_abbreviation, Authorized_Users" + ")" + "VALUES (%s, %s, %s, %s, %s, %s, 'robwilliams')"), + tuple((row["id"], row["description"], row["description"], row["units"], row["id"], row["id"]) for row in batch)) paramstr = ", ".join(["%s"] * len(batch)) cursor.execute( diff --git a/uploader/phenotypes/views.py b/uploader/phenotypes/views.py index 8e47242..834a450 100644 --- a/uploader/phenotypes/views.py +++ b/uploader/phenotypes/views.py @@ -1015,8 +1015,9 @@ def load_data_success( gn2_uri = urlparse(app.config["GN2_SERVER_URL"]) job = gnlibs_jobs.job(jobsconn, job_id, fulldetails=True) app.logger.debug("THE JOB: %s", job) - _xref_ids = (str(item) for item - in json.loads(job["metadata"].get("xref_ids", "[]"))) + _xref_ids = tuple( + str(item) for item + in json.loads(job["metadata"].get("xref_ids", "[]"))) _publication = fetch_publication_by_id( conn, int(job["metadata"].get("publication_id", "0"))) _search_terms = (item for item in diff --git a/uploader/templates/samples/upload-samples.html b/uploader/templates/samples/upload-samples.html index 25d3290..6422094 100644 --- a/uploader/templates/samples/upload-samples.html +++ b/uploader/templates/samples/upload-samples.html @@ -66,7 +66,7 @@ <div class="form-group"> <label for="file-samples" class="form-label">select file</label> <input type="file" name="samples_file" id="file:samples" - accept="text/csv, text/tab-separated-values" + accept="text/csv, text/tab-separated-values, text/plain" class="form-control" /> </div> |