aggregate & display results

diff --git a/apps/search/__init__.py b/apps/search/__init__.py
index 0042997..bc07a74 100644 (file)
--- a/apps/search/__init__.py
+++ b/apps/search/__init__.py
@@ -1,3 +1,3 @@
 import lucene
 JVM = lucene.initVM(lucene.CLASSPATH)
 import lucene
 JVM = lucene.initVM(lucene.CLASSPATH)

-from index import Index, Search, ReusableIndex, MultiSearch
+from index import Index, Search, ReusableIndex, MultiSearch, SearchResult

diff --git a/apps/search/index.py b/apps/search/index.py
index 36f4247..1c79ea2 100644 (file)
--- a/apps/search/index.py
+++ b/apps/search/index.py
@@ -370,6 +370,76 @@ class Search(IndexStore):
 # }
 
 
 # }
 
 

+class SearchResult(object):
+    def __init__(self, searcher, scoreDocs, score=None):
+        if score:
+            self.score = score
+        else:
+            self.score = scoreDocs.score
+
+        self.fragments = []
+        self.scores = {}
+        self.sections = []
+
+        stored = searcher.doc(scoreDocs.doc)
+        self.book_id = int(stored.get("book_id"))
+
+        fragment = stored.get("fragment_anchor")
+        if fragment:
+            self.fragments.append(fragment)
+            self.scores[fragment] = scoreDocs.score
+
+        header_type = stored.get("header_type")
+        if header_type:
+            sec = (header_type, int(stored.get("header_index")))
+            self.sections.append(sec)
+            self.scores[sec] = scoreDocs.score
+
+    def get_book(self):
+        return catalogue.models.Book.objects.get(id=self.book_id)
+
+    book = property(get_book)
+
+    def get_parts(self):
+        book = self.book
+        parts = [{"header": s[0], "position": s[1], '_score_key': s} for s in self.sections] \
+            + [{"fragment": book.fragments.get(anchor=f), '_score_key':f} for f in self.fragments]
+
+        parts.sort(lambda a, b: cmp(self.scores[a['_score_key']], self.scores[b['_score_key']]))
+        print("bookid: %d parts: %s" % (self.book_id, parts))
+        return parts
+
+    parts = property(get_parts)
+
+    def merge(self, other):
+        if self.book_id != other.book_id:
+            raise ValueError("this search result is or book %d; tried to merge with %d" % (self.book_id, other.book_id))
+        self.fragments += other.fragments
+        self.sections += other.sections
+        self.scores.update(other.scores)
+        if other.score > self.score:
+            self.score = other.score
+        return self
+
+    def __unicode__(self):
+        return u'SearchResult(book_id=%d, score=%d)' % (self.book_id, self.score)
+
+    @staticmethod
+    def aggregate(*result_lists):
+        books = {}
+        for rl in result_lists:
+            for r in rl:
+                if r.book_id in books:
+                    books[r.book_id].merge(r)
+                    #print(u"already have one with score %f, and this one has score %f" % (books[book.id][0], found.score))
+                else:
+                    books[r.book_id] = r
+        return books.values()
+
+    def __cmp__(self, other):
+        return cmp(self.score, other.score)
+
+

 class MultiSearch(Search):
     """Class capable of IMDb-like searching"""
     def get_tokens(self, queryreader):
 class MultiSearch(Search):
     """Class capable of IMDb-like searching"""
     def get_tokens(self, queryreader):


@@ -402,15 +472,25 @@ class MultiSearch(Search):
         return BlockJoinQuery(query, self.parent_filter,
                               BlockJoinQuery.ScoreMode.Total)
 
         return BlockJoinQuery(query, self.parent_filter,
                               BlockJoinQuery.ScoreMode.Total)
 

-    def search_perfect(self, tokens, max_results=20):
-        qrys = [self.make_phrase(tokens, field=fld) for fld in ['author', 'title', 'content']]
+    def search_perfect_book(self, tokens, max_results=20):
+        qrys = [self.make_phrase(tokens, field=fld) for fld in ['author', 'title']]

 
         books = []
         for q in qrys:
             top = self.searcher.search(q, max_results)
             for found in top.scoreDocs:
 
         books = []
         for q in qrys:
             top = self.searcher.search(q, max_results)
             for found in top.scoreDocs:

-                book_info = self.searcher.doc(found.doc)
-                books.append((found.score, catalogue.models.Book.objects.get(id=book_info.get("book_id")), []))
+                books.append(SearchResult(self.searcher, found))
+        return books
+
+    def search_perfect_parts(self, tokens, max_results=20):
+        qrys = [self.make_phrase(tokens, field=fld) for fld in ['content']]
+
+        books = []
+        for q in qrys:
+            top = self.searcher.search(q, max_results)
+            for found in top.scoreDocs:
+                books.append(SearchResult(self.searcher, found))
+

         return books
 
     def search_everywhere(self, tokens, max_results=20):
         return books
 
     def search_everywhere(self, tokens, max_results=20):


@@ -437,24 +517,10 @@ class MultiSearch(Search):
         top_groups = collector.getTopGroups(in_content_join, Sort.RELEVANCE, 0, max_results, 0, True)
         if top_groups:
             for grp in top_groups.groups:
         top_groups = collector.getTopGroups(in_content_join, Sort.RELEVANCE, 0, max_results, 0, True)
         if top_groups:
             for grp in top_groups.groups:

-                doc_id = Integer.cast_(grp.groupValue).intValue()
-                book_data = self.searcher.doc(doc_id)
-                book = catalogue.models.Book.objects.get(id=book_data.get("book_id"))
-                parts = []

                 for part in grp.scoreDocs:
                 for part in grp.scoreDocs:

-                    part_data = self.searcher.doc(part.doc)
-                    header_type = part_data.get("header_type")
-                    if header_type:
-                        parts.append((part.score, {"header": header_type, "position": int(part_data.get("header_index"))}))
-                    fragment = part_data.get("fragment_anchor")
-                    if fragment:
-                        fragment = book.fragments.get(anchor=fragment)
-                        parts.append((part.score, {"fragment": fragment}))
-                books.append((grp.maxScore, book, parts))
-                
+                    books.append(SearchResult(self.searcher, part, score=grp.maxScore))

         return books
 
         return books
 

-

     def multisearch(self, query, max_results=50):
         """
         Search strategy:
     def multisearch(self, query, max_results=50):
         """
         Search strategy:

diff --git a/apps/search/views.py b/apps/search/views.py
index 5ed6107..fc14b06 100644 (file)
--- a/apps/search/views.py
+++ b/apps/search/views.py
@@ -8,7 +8,7 @@ from django.views.decorators import cache
 from catalogue.utils import get_random_hash
 from catalogue.models import Book, Tag
 from catalogue import forms
 from catalogue.utils import get_random_hash
 from catalogue.models import Book, Tag
 from catalogue import forms

-from search import MultiSearch, JVM
+from search import MultiSearch, JVM, SearchResult

 
 
 def main(request):
 
 
 def main(request):


@@ -19,9 +19,13 @@ def main(request):
     results = None
     if 'q' in request.GET:
         toks = srch.get_tokens(request.GET['q'])
     results = None
     if 'q' in request.GET:
         toks = srch.get_tokens(request.GET['q'])

-        results = srch.search_perfect(toks) + srch.search_everywhere(toks)
-        results.sort(lambda a, b: cmp(a[0], b[0]) < 0)
-        print("searched, results are: %s\n" % results)
+        results = SearchResult.aggregate(srch.search_perfect_book(toks),
+                                         srch.search_perfect_parts(toks),
+                                         srch.search_everywhere(toks))
+        results.sort(reverse=True)
+
+        for r in results:
+            print r.parts

 
     return render_to_response('newsearch/search.html', {"results": results},
                               context_instance=RequestContext(request))
 
     return render_to_response('newsearch/search.html', {"results": results},
                               context_instance=RequestContext(request))

diff --git a/wolnelektury/templates/newsearch/search.html b/wolnelektury/templates/newsearch/search.html
index e018b21..4dfc858 100644 (file)
--- a/wolnelektury/templates/newsearch/search.html
+++ b/wolnelektury/templates/newsearch/search.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load catalogue_tags %}
 
 {% load i18n %}
 {% load catalogue_tags %}
 

-{% block title %}Leśmianator w WolneLektury.pl{% endblock %}
+{% block title %}Search{% endblock %}

 
 

-{% block metadescription %}Stwórz własny wierszmiks z utworów znajdujących się na Wolnych Lekturach.{% endblock %}
+{% block metadescription %}{% endblock %}

 
 

-{% block bodyid %}lesmianator{% endblock %}
+{% block bodyid %}newsearch{% endblock %}

 
 {% block body %}
     <h1>Search</h1>
 
 {% block body %}
     <h1>Search</h1>


@@ -19,11 +19,11 @@
 
     <div id="results">
       <ol>
 
     <div id="results">
       <ol>

-      {% for score,book,parts in results %}
+      {% for result in results %}

       <li>
       <li>

-       <p>{{book.author}} - {{book.title}} (id: {{book.id}}, score: {{score}})</p>
+       <p>{{result.book.pretty_title}} (id: {{result.book.id}}, score: {{result.score}})</p>

        <ul>
        <ul>

-         {% for score,part in parts %}
+         {% for part in result.parts %}

          {% if part.header %}
          <li>W {{part.header}} nr {{part.position}}</li>
          {% else %} 
          {% if part.header %}
          <li>W {{part.header}} nr {{part.position}}</li>
          {% else %}