From 59f692719bb6b4163594243e4c11262dc88466b4 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 12 Jan 2019 17:38:56 +0100 Subject: fixing imports --- megapixels/app/models/sql_factory.py | 4 +++- megapixels/app/server/api.py | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'megapixels/app') diff --git a/megapixels/app/models/sql_factory.py b/megapixels/app/models/sql_factory.py index a89d89bf..5cdaa889 100644 --- a/megapixels/app/models/sql_factory.py +++ b/megapixels/app/models/sql_factory.py @@ -62,7 +62,9 @@ def load_sql_dataset(path, replace=False, engine=None, base_model=None): df = pd.read_csv(fn) # fix columns that are named "index", a sql reserved word df.reindex_axis(sorted(df.columns), axis=1) - # df.columns = sorted(table.__table__.columns).keys() + columns = [column.name for column in table.__table__.columns] + # print(columns) + df.columns = sorted(columns) df.to_sql(name=table.__tablename__, con=engine, if_exists='replace', index=False) return dataset diff --git a/megapixels/app/server/api.py b/megapixels/app/server/api.py index 0af217e3..5219a8da 100644 --- a/megapixels/app/server/api.py +++ b/megapixels/app/server/api.py @@ -148,13 +148,15 @@ def name_lookup(dataset_name): 'q': q, 'timing': time.time() - start, } - if len(terms) == 1: - names = dataset.search_name('%' + term + '%') if term else [] + if len(terms) == 0: + results = [] + elif len(terms) == 1: + names = dataset.search_name('%' + terms[0] + '%') if terms[0] else [] results = dataset.get_file_records_for_identities(names) else: lookup = {} results_lookup = {} - for i, term in enumerate(terms): + for i, term in enumerate(terms[0:5]): search_term = '%' + term + '%' names = dataset.search_name(term) if term else [] for name in names: @@ -163,7 +165,7 @@ def name_lookup(dataset_name): else: lookup[name.id] = 1 results_lookup[name.id] = name - top_names = [results_lookup[item[0]] for item in sorted(lookup.items(), key=operator.itemgetter(1))][0:20] + top_names = [results_lookup[item[0]] for item in sorted(lookup.items(), key=operator.itemgetter(1))][0:10] results = dataset.get_file_records_for_identities(top_names) # print(results) -- cgit v1.2.3-70-g09d2