From c3eec5ef62c6aacf4ca8c8056e1f9150dcd31506 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 12 Jan 2019 17:58:51 +0100 Subject: returning results again --- megapixels/app/server/api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'megapixels/app/server/api.py') diff --git a/megapixels/app/server/api.py b/megapixels/app/server/api.py index 5219a8da..5f33e84b 100644 --- a/megapixels/app/server/api.py +++ b/megapixels/app/server/api.py @@ -111,7 +111,8 @@ def upload(dataset_name): dists.append(round(float(_d), 2)) ids.append(_i+1) - results = [ dataset.get_identity(int(_i)) for _i in ids ] + file_records = [ dataset.get_file_record(int(_i)) for _i in ids ] + identities = [ dataset.get_identity(rec.identity_id) for rec in file_records ] # print(distances) # print(ids) @@ -128,7 +129,7 @@ def upload(dataset_name): # print(results) return jsonify({ 'query': query, - 'results': results, + 'results': identities, 'distances': dists, }) @@ -148,6 +149,7 @@ def name_lookup(dataset_name): 'q': q, 'timing': time.time() - start, } + if len(terms) == 0: results = [] elif len(terms) == 1: -- cgit v1.2.3-70-g09d2