Search: optimize search count

1 files changed, 4 insertions, 3 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 2fdda5efb..31b4f7853 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -17,7 +17,8 @@ from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse, NoReverseMatch
-from django.db.models import Q, ImageField, Func, ExpressionWrapper, FloatField
+from django.db.models import Q, Count, ImageField, Func, ExpressionWrapper, \
+    FloatField
 from django.db.models.fields import FieldDoesNotExist
 from django.http import HttpResponse
 from django.shortcuts import render
@@ -1500,8 +1501,9 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
 
         items = items.distinct()
 
+        items_nb = items.values('id').aggregate(Count('id'))['id__count']
         if count:
-            return items.count()
+            return items_nb
         # print(unicode(items.query).encode('utf-8'))
 
         if search_vector:  # for serialization
@@ -1638,7 +1640,6 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
             start = 0
             end = 20
 
-        items_nb = items.count()
         if manual_sort_key:
             items = items.all()
         else: