Merge pull request #405 from matrix-org/erikj/search-ts

Change the result dict to be a list in /search response
This commit is contained in:
Erik Johnston 2015-12-08 16:15:27 +00:00
commit 7c2ff8c889

View File

@ -135,7 +135,7 @@ class SearchHandler(BaseHandler):
defer.returnValue({ defer.returnValue({
"search_categories": { "search_categories": {
"room_events": { "room_events": {
"results": {}, "results": [],
"count": 0, "count": 0,
"highlights": [], "highlights": [],
} }
@ -348,16 +348,14 @@ class SearchHandler(BaseHandler):
# We're now about to serialize the events. We should not make any # We're now about to serialize the events. We should not make any
# blocking calls after this. Otherwise the 'age' will be wrong # blocking calls after this. Otherwise the 'age' will be wrong
results = { results = [
e.event_id: { {
"rank": rank_map[e.event_id], "rank": rank_map[e.event_id],
"result": serialize_event(e, time_now), "result": serialize_event(e, time_now),
"context": contexts.get(e.event_id, {}), "context": contexts.get(e.event_id, {}),
} }
for e in allowed_events for e in allowed_events
} ]
logger.info("Found %d results", len(results))
rooms_cat_res = { rooms_cat_res = {
"results": results, "results": results,