X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/756585089fb09cd0e25856b55510e69a52112e5f..85f97b6322eacc6fa89788aba7998fc485f85cfc:/apps/search/views.py?ds=inline diff --git a/apps/search/views.py b/apps/search/views.py index d9b2f26d5..e9b25649c 100644 --- a/apps/search/views.py +++ b/apps/search/views.py @@ -1,25 +1,40 @@ +# -*- coding: utf-8 -*- +from django.conf import settings from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from django.contrib.auth.decorators import login_required from django.views.decorators import cache +from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect +from django.utils.translation import ugettext as _ from catalogue.utils import get_random_hash -from catalogue.models import Book, Tag -from catalogue import forms -from search import MultiSearch, JVM, SearchResult +from catalogue.models import Book, Tag, Fragment +from catalogue.fields import dumps +from catalogue.views import JSONResponse +from search import Search, JVM, SearchResult from lucene import StringReader +from suggest.forms import PublishingSuggestForm import enchant dictionary = enchant.Dict('pl_PL') +def match_word_re(word): + if 'sqlite' in settings.DATABASES['default']['ENGINE']: + return r"\b%s\b" % word + elif 'mysql' in settings.DATABASES['default']['ENGINE']: + return "[[:<:]]%s[[:>:]]" % word + + def did_you_mean(query, tokens): change = {} - for t in tokens: - print("%s ok? %s, sug: %s" %(t, dictionary.check(t), dictionary.suggest(t))) + authors = Tag.objects.filter(category='author', name__iregex=match_word_re(t)) + if len(authors) > 0: + continue + if not dictionary.check(t): try: change[t] = dictionary.suggest(t)[0] @@ -31,36 +46,133 @@ def did_you_mean(query, tokens): for frm, to in change.items(): query = query.replace(frm, to) - + return query +def hint(request): + prefix = request.GET.get('term', '') + if len(prefix) < 2: + return JSONResponse([]) + JVM.attachCurrentThread() + s = Search() + + hint = s.hint() + try: + tags = request.GET.get('tags', '') + hint.tags(Tag.get_tag_list(tags)) + except: + pass + + # tagi beda ograniczac tutaj + # ale tagi moga byc na ksiazce i na fragmentach + # jezeli tagi dot tylko ksiazki, to wazne zeby te nowe byly w tej samej ksiazce + # jesli zas dotycza themes, to wazne, zeby byly w tym samym fragmencie. + + tags = s.hint_tags(prefix) + books = s.hint_books(prefix) + + # TODO DODAC TU HINTY + + return JSONResponse( + [{'label': t.name, + 'category': _(t.category), + 'id': t.id, + 'url': t.get_absolute_url()} + for t in tags] + \ + [{'label': b.title, + 'category': _('book'), + 'id': b.id, + 'url': b.get_absolute_url()} + for b in books]) + + def main(request): results = {} JVM.attachCurrentThread() # where to put this? - srch = MultiSearch() + srch = Search() results = None query = None fuzzy = False + if 'q' in request.GET: + tags = request.GET.get('tags', '') query = request.GET['q'] + book_id = request.GET.get('book', None) + book = None + if book_id is not None: + book = get_object_or_404(Book, id=book_id) + + hint = srch.hint() + try: + tag_list = Tag.get_tag_list(tags) + except: + tag_list = [] + + if len(query) < 2: + return render_to_response('catalogue/search_too_short.html', {'tags': tag_list, 'prefix': query}, + context_instance=RequestContext(request)) + + hint.tags(tag_list) + if book: + hint.books(book) + toks = StringReader(query) + tokens_cache = {} fuzzy = 'fuzzy' in request.GET if fuzzy: fuzzy = 0.7 + author_results = srch.search_phrase(toks, 'authors', fuzzy=fuzzy, tokens_cache=tokens_cache) + title_results = srch.search_phrase(toks, 'title', fuzzy=fuzzy, tokens_cache=tokens_cache) - results = SearchResult.aggregate(srch.search_perfect_book(toks, fuzzy=fuzzy), - srch.search_perfect_parts(toks, fuzzy=fuzzy), - srch.search_everywhere(toks, fuzzy=fuzzy)) - results.sort(reverse=True) + # Boost main author/title results with mixed search, and save some of its results for end of list. + # boost author, title results + author_title_mixed = srch.search_some(toks, ['authors', 'title', 'tags'], fuzzy=fuzzy, tokens_cache=tokens_cache) + author_title_rest = [] + for b in author_title_mixed: + bks = filter(lambda ba: ba.book_id == b.book_id, author_results + title_results) + for b2 in bks: + b2.boost *= 1.1 + if bks is []: + author_title_rest.append(b) + + text_phrase = SearchResult.aggregate(srch.search_phrase(toks, 'content', fuzzy=fuzzy, tokens_cache=tokens_cache)) + [r.process_hits() for r in text_phrase] + + everywhere = SearchResult.aggregate(srch.search_everywhere(toks, fuzzy=fuzzy, tokens_cache=tokens_cache), author_title_rest) + [r.process_hits() for r in everywhere] + + for res in [author_results, title_results, text_phrase, everywhere]: + res.sort(reverse=True) - for r in results: - print r.parts + suggestion = did_you_mean(query, srch.get_tokens(toks, field="SIMPLE")) + + results = author_results + title_results + text_phrase + everywhere + results.sort(reverse=True) + + if len(results) == 1: + if len(results[0].hits) == 0: + return HttpResponseRedirect(results[0].book.get_absolute_url()) + elif len(results[0].hits) == 1 and results[0].hits[0] is not None: + frag = Fragment.objects.get(anchor=results[0].hits[0]) + return HttpResponseRedirect(frag.get_absolute_url()) + elif len(results) == 0: + form = PublishingSuggestForm(initial={"books": query + ", "}) + return render_to_response('catalogue/search_no_hits.html', + {'tags': tag_list, + 'prefix': query, + "form": form, + 'did_you_mean': suggestion}, + context_instance=RequestContext(request)) - return render_to_response('newsearch/search.html', {'results': results, - 'did_you_mean': (query is not None) and - did_you_mean(query, srch.get_tokens(query, field='SIMPLE')), - 'fuzzy': fuzzy}, - context_instance=RequestContext(request)) + return render_to_response('catalogue/search_multiple_hits.html', + {'tags': tag_list, + 'prefix': query, + 'results': { 'author': author_results, + 'title': title_results, + 'content': text_phrase, + 'other': everywhere}, + 'did_you_mean': suggestion}, + context_instance=RequestContext(request))