diff --git a/webservice/sqlite_view.py b/webservice/sqlite_view.py index 29670a19f3b02b710da98e713bf9f176e56809d4..8f9e4e6f1819aa22532554300f5ffbcec1f49966 100644 --- a/webservice/sqlite_view.py +++ b/webservice/sqlite_view.py @@ -16,11 +16,14 @@ proposal = args['proposal'].zfill(6) run = args['run'] conn = sqlite3.connect(sqlite_fpath) -c = conn.cursor() -c.execute("SELECT * FROM jobs") +c = conn.execute( + "SELECT status, elapsed, karabo_id, det_type, action FROM " + "slurm_jobs INNER JOIN executions USING (exec_id) " + "INNER JOIN requests USING (req_id) " + "WHERE proposal = ? AND run = ?", + (proposal, run) +) for r in c.fetchall(): - rid, jobid, db_proposal, db_run, status, time, _, _ = r - if db_proposal == proposal and db_run == run: - print(r) + print(r)