# -*- 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.utils.translation import ugettext as _
from catalogue.utils import get_random_hash
-from catalogue.models import Book, Tag, Fragment, TAG_CATEGORIES
+from catalogue.models import Book, Tag, Fragment
from catalogue.fields import dumps
from catalogue.views import JSONResponse
-from catalogue import forms
-from search import MultiSearch, JVM, SearchResult
+from search import Search, JVM, SearchResult
from lucene import StringReader
from suggest.forms import PublishingSuggestForm
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 = {}
- # sprawdzić, czy słowo nie jest aby autorem - proste szukanie termu w author!
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]
return query
-def category_name(category):
- try:
- return filter(lambda c: c[0] == category, TAG_CATEGORIES)[0][1].encode('utf-8')
- except IndexError:
- raise KeyError("No category %s" % category)
-
-
def hint(request):
prefix = request.GET.get('term', '')
if len(prefix) < 2:
return JSONResponse([])
JVM.attachCurrentThread()
- s = MultiSearch()
+ s = Search()
hint = s.hint()
try:
# 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.
- # import pdb; pdb.set_trace()
-
tags = s.hint_tags(prefix)
books = s.hint_books(prefix)
return JSONResponse(
[{'label': t.name,
- 'category': _(category_name(t.category)),
+ 'category': _(t.category),
'id': t.id,
'url': t.get_absolute_url()}
for t in tags] + \
[{'label': b.title,
- 'category': _(category_name('book')),
+ 'category': _('book'),
'id': b.id,
'url': b.get_absolute_url()}
for b in books])
-def foo(s, q, tag_list=None):
- hint = s.hint()
- try:
- tag_list = Tag.get_tag_list(tag_list)
- hint.tags(tag_list)
- except:
- tag_list = None
-
- q = StringReader(q)
- return (q, hint)
-
-
def main(request):
results = {}
JVM.attachCurrentThread() # where to put this?
- srch = MultiSearch()
+ srch = Search()
results = None
query = None
context_instance=RequestContext(request))
hint.tags(tag_list)
- hint.books(book)
+ if book:
+ hint.books(book)
toks = StringReader(query)
+ tokens_cache = {}
fuzzy = 'fuzzy' in request.GET
if fuzzy:
fuzzy = 0.7
- results = SearchResult.aggregate(srch.search_perfect_book(toks, fuzzy=fuzzy, hint=hint),
- srch.search_perfect_parts(toks, fuzzy=fuzzy, hint=hint),
- srch.search_everywhere(toks, fuzzy=fuzzy, hint=hint))
+ 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)
+
+ # 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)
+
+ suggestion = did_you_mean(query, srch.get_tokens(toks, field="SIMPLE"))
+
+ results = author_results + title_results + text_phrase + everywhere
results.sort(reverse=True)
-
- for r in results:
- print r.hits
-
+
if len(results) == 1:
if len(results[0].hits) == 0:
return HttpResponseRedirect(results[0].book.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, "pubsuggest_form": form,
- 'form': forms.SearchForm()},
+ {'tags': tag_list,
+ 'prefix': query,
+ "form": form,
+ 'did_you_mean': suggestion},
context_instance=RequestContext(request))
return render_to_response('catalogue/search_multiple_hits.html',
- {'tags': tag_list, 'prefix': query,
- 'results': results, 'from': forms.SearchForm()},
+ {'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))
-
- # 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))
fnp / wolnelektury.git / blobdiff