From 1cf8adb395900f6555bb9dbf55acbe5427ae721d Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 16 Mar 2011 05:23:05 -0400 Subject: [PATCH 1/4] Fixed repeated field name --- apps/documents/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documents/views.py b/apps/documents/views.py index 8027b8c753..48690bd738 100644 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -70,7 +70,7 @@ def document_list(request): return object_list( request, - queryset=Document.objects.only('file_filename', 'file_filename', 'file_extension').all(), + queryset=Document.objects.only('file_filename', 'file_extension').all(), template_name='generic_list.html', extra_context={ 'title':_(u'documents'), From fe9c7884ea621aa638cccb345765d7dda0e4a72d Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 16 Mar 2011 05:23:43 -0400 Subject: [PATCH 2/4] Simplyfied logic --- apps/dynamic_search/api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/dynamic_search/api.py b/apps/dynamic_search/api.py index 8b91f9a259..749bdf7864 100644 --- a/apps/dynamic_search/api.py +++ b/apps/dynamic_search/api.py @@ -84,8 +84,10 @@ def perform_search(query_string): model_result_ids &= single_result_ids result_count += len(model_result_ids) - results = model.objects.filter(pk__in=list(model_result_ids)[:LIMIT])[:LIMIT] - shown_result_count += results.count() + #results = model.objects.filter(pk__in=list(model_result_ids)[:LIMIT]) + results = model.objects.only('file_filename', 'file_extension').in_bulk(list(model_result_ids)[:LIMIT]).values() + #shown_result_count += results.count() + shown_result_count += len(results)#.count() if results: model_list[data['text']] = results for result in results: From fdf3e2702a633c0ab5c4d6ed90576d9b0c512402 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 16 Mar 2011 05:30:34 -0400 Subject: [PATCH 3/4] Cleanup search code --- apps/dynamic_search/api.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/dynamic_search/api.py b/apps/dynamic_search/api.py index 749bdf7864..d7b5c946a2 100644 --- a/apps/dynamic_search/api.py +++ b/apps/dynamic_search/api.py @@ -84,10 +84,8 @@ def perform_search(query_string): model_result_ids &= single_result_ids result_count += len(model_result_ids) - #results = model.objects.filter(pk__in=list(model_result_ids)[:LIMIT]) - results = model.objects.only('file_filename', 'file_extension').in_bulk(list(model_result_ids)[:LIMIT]).values() - #shown_result_count += results.count() - shown_result_count += len(results)#.count() + results = model.objects.in_bulk(list(model_result_ids)[:LIMIT]).values() + shown_result_count += len(results) if results: model_list[data['text']] = results for result in results: From 045e633c0d60abcb75a1f73e5037dddc18adaf0c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 16 Mar 2011 06:20:29 -0400 Subject: [PATCH 4/4] Updated TODO --- docs/TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/TODO b/docs/TODO index c95c73dc2f..041b400759 100644 --- a/docs/TODO +++ b/docs/TODO @@ -171,3 +171,4 @@ OCR * Support ocropus * Support cuneiform * Implement StringIO +* Add storage replication delay setting