about summary refs log tree commit diff
path: root/uploader/expression_data/dbinsert.py
diff options
context:
space:
mode:
Diffstat (limited to 'uploader/expression_data/dbinsert.py')
-rw-r--r--uploader/expression_data/dbinsert.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/uploader/expression_data/dbinsert.py b/uploader/expression_data/dbinsert.py
index 32ca359..7040698 100644
--- a/uploader/expression_data/dbinsert.py
+++ b/uploader/expression_data/dbinsert.py
@@ -7,16 +7,17 @@ from datetime import datetime
 
 from redis import Redis
 from MySQLdb.cursors import DictCursor
+from gn_libs.mysqldb import database_connection
 from flask import (
     flash, request, url_for, Blueprint, redirect, render_template,
     current_app as app)
 
 from uploader import jobs
 from uploader.authorisation import require_login
+from uploader.db_utils import with_db_connection
 from uploader.population.models import populations_by_species
 from uploader.species.models import all_species, species_by_id
 from uploader.platforms.models import platform_by_species_and_id
-from uploader.db_utils import with_db_connection, database_connection
 
 dbinsertbp = Blueprint("dbinsert", __name__)
 
@@ -93,7 +94,7 @@ def select_platform():
         job = jobs.job(rconn, jobs.jobsnamespace(), job_id)
         if job:
             filename = job["filename"]
-            filepath = f"{app.config['UPLOAD_FOLDER']}/{filename}"
+            filepath = f"{app.config['UPLOADS_DIRECTORY']}/{filename}"
             if os.path.exists(filepath):
                 default_species = 1
                 gchips = genechips()
@@ -366,7 +367,7 @@ def insert_data():
         assert form.get("datasetid"), "dataset"
 
         filename = form["filename"]
-        filepath = f"{app.config['UPLOAD_FOLDER']}/{filename}"
+        filepath = f"{app.config['UPLOADS_DIRECTORY']}/{filename}"
         redisurl = app.config["REDIS_URL"]
         if os.path.exists(filepath):
             with Redis.from_url(redisurl, decode_responses=True) as rconn:
@@ -376,7 +377,7 @@ def insert_data():
                         form["species"], form["genechipid"], form["datasetid"],
                         app.config["SQL_URI"], redisurl,
                         app.config["JOBS_TTL_SECONDS"]),
-                    redisurl, f"{app.config['UPLOAD_FOLDER']}/job_errors")
+                    redisurl, f"{app.config['UPLOADS_DIRECTORY']}/job_errors")
 
             return redirect(url_for("dbinsert.insert_status", job_id=job["jobid"]))
         return render_error(f"File '{filename}' no longer exists.")