celery fixes

[wolnelektury.git] / src / search / mock_search.py

diff --git a/src/search/mock_search.py b/src/search/mock_search.py
index 344e79f..33d2a5e 100644 (file)
--- a/src/search/mock_search.py
+++ b/src/search/mock_search.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from mock import Mock
+from unittest.mock import Mock

 from catalogue.models import Book, Tag
 from random import randint, choice
 
 from catalogue.models import Book, Tag
 from random import randint, choice
 


@@ -20,11 +19,14 @@ class Search(Mock):
 
     index = MockIndex()
 
 
     index = MockIndex()
 

-    @staticmethod
-    def _find_some_books(query_terms=None, max_results=20):
+    def search_words(self, words, fields, required=None, book=True, picture=False):

         from .index import SearchResult
 
         from .index import SearchResult
 

-        qs = Book.objects.order_by('?')
+        max_results = 20
+        
+        if picture: return []
+
+        qs = Book.objects.filter(findable=True).order_by('?')

         results = []
         for book in qs[:randint(1, max_results)]:
             doc = {
         results = []
         for book in qs[:randint(1, max_results)]:
             doc = {


@@ -32,10 +34,7 @@ class Search(Mock):
                 'book_id': book.pk,
                 'published_date': randint(1000, 1920),
                 }
                 'book_id': book.pk,
                 'published_date': randint(1000, 1920),
                 }

-            res = SearchResult(doc, how_found='mock', query_terms=query_terms)
+            res = SearchResult(doc, how_found='mock', query_terms=words)

             results.append(res)
         return results
 
             results.append(res)
         return results
 

-    def search_everywhere(self, searched, query_terms=None):
-        return []
-