[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GMG-Devel] [PATCH 47/83] Adapt results collection to change in result g
From: |
Alon Levy |
Subject: |
[GMG-Devel] [PATCH 47/83] Adapt results collection to change in result generation. |
Date: |
Tue, 25 Feb 2014 21:58:29 +0200 |
From: Praveen Kumar <address@hidden>
---
mediagoblin/plugins/search/views.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/mediagoblin/plugins/search/views.py
b/mediagoblin/plugins/search/views.py
index 343e362..a948f77 100644
--- a/mediagoblin/plugins/search/views.py
+++ b/mediagoblin/plugins/search/views.py
@@ -13,10 +13,11 @@ def search_in_indices(request, query):
indices = registry.IndexRegistry.indices()
all_results = []
for index in indices.itervalues():
- results = index.search(query, request)
- if len(results)>0:
- all_results.extend(results)
-
+ search_results = index.search(query, request)
+ if len(search_results['results'])>0:
+ all_results.append(search_results)
+ _log.info("Total results found")
+ _log.info(all_results)
return all_results
def search(request):
@@ -32,9 +33,9 @@ def search(request):
if request.method == 'POST' and form.validate():
query = form.query.data
- all_results = search_in_indices(request, query)
+ result_categories = search_in_indices(request, query)
context.update({
- 'results': all_results,
+ 'result_categories': result_categories,
'results_found': True,
'query': query,
})
--
1.8.5.3
- [GMG-Devel] [PATCH 36/83] Add schema for MediaTag., (continued)
- [GMG-Devel] [PATCH 36/83] Add schema for MediaTag., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 37/83] Register schemas for MediaEntry and MediaTag., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 38/83] Add gmg command to delete all indices., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 39/83] Clean up and add docstring to search methods., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 40/83] Add try-except block to event listeners., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 42/83] Store attributes from a model only it its available., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 43/83] Add field for storing search results., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 41/83] Correct method names in event listeners, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 44/83] Remove the field for storing search results with the index., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 46/83] Add verbose_name and css_id to search results., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 47/83] Adapt results collection to change in result generation.,
Alon Levy <=
- [GMG-Devel] [PATCH 48/83] Modify search template to show tabbed results., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 49/83] Show only unique results., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 50/83] Change element ids and some template fixes., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 51/83] Change view function for the search page., Alon Levy, 2014/02/25