book search - new design - almost ready

diff --git a/apps/search/index.py b/apps/search/index.py
index cc478ee..e59c38b 100644 (file)
--- a/apps/search/index.py
+++ b/apps/search/index.py
@@ -408,7 +408,7 @@ class Index(BaseIndex):
                 doc = add_part(snippets, header_index=position, header_type=header.tag, content=content)
 
                 self.index.addDocument(doc)
                 doc = add_part(snippets, header_index=position, header_type=header.tag, content=content)
 
                 self.index.addDocument(doc)

-
+                

                 for start, end in walker(header):
                     if start is not None and start.tag == 'begin':
                         fid = start.attrib['id'][1:]
                 for start, end in walker(header):
                     if start is not None and start.tag == 'begin':
                         fid = start.attrib['id'][1:]


@@ -563,6 +563,8 @@ class SearchResult(object):
 
         fragment = stored.get("fragment_anchor")
 
 
         fragment = stored.get("fragment_anchor")
 

+        if snippets:
+            snippets = snippets.replace("/\n", "\n")

         hit = (sec + (header_span,), fragment, scoreDocs.score, {'how_found': how_found, 'snippets': snippets and [snippets] or []})
 
         self._hits.append(hit)
         hit = (sec + (header_span,), fragment, scoreDocs.score, {'how_found': how_found, 'snippets': snippets and [snippets] or []})
 
         self._hits.append(hit)


@@ -630,6 +632,7 @@ class SearchResult(object):
             frag = catalogue.models.Fragment.objects.get(anchor=f[FRAGMENT])
             m = {'score': f[SCORE],
                  'fragment': frag,
             frag = catalogue.models.Fragment.objects.get(anchor=f[FRAGMENT])
             m = {'score': f[SCORE],
                  'fragment': frag,

+                 'section_number': f[POSITION][POSITION_INDEX] + 1,

                  'themes': frag.tags.filter(category='theme')
                  }
             m.update(f[OTHER])
                  'themes': frag.tags.filter(category='theme')
                  }
             m.update(f[OTHER])


@@ -884,7 +887,7 @@ class Search(IndexStore):
                 self.chain_filters([only_in, self.term_filter(Term('is_book', 'true'))]),
                 max_results)
             for found in top.scoreDocs:
                 self.chain_filters([only_in, self.term_filter(Term('is_book', 'true'))]),
                 max_results)
             for found in top.scoreDocs:

-                books.append(SearchResult(self.searcher, found))
+                books.append(SearchResult(self.searcher, found, how_found="search_perfect_book"))

         return books
 
     def search_book(self, searched, max_results=20, fuzzy=False, hint=None):
         return books
 
     def search_book(self, searched, max_results=20, fuzzy=False, hint=None):


@@ -910,7 +913,7 @@ class Search(IndexStore):
                                    self.chain_filters([only_in, self.term_filter(Term('is_book', 'true'))]),
             max_results)
         for found in top.scoreDocs:
                                    self.chain_filters([only_in, self.term_filter(Term('is_book', 'true'))]),
             max_results)
         for found in top.scoreDocs:

-            books.append(SearchResult(self.searcher, found))
+            books.append(SearchResult(self.searcher, found, how_found="search_book"))

 
         return books
 
 
         return books
 


@@ -932,7 +935,7 @@ class Search(IndexStore):
                                                            flt]),
                                        max_results)
             for found in top.scoreDocs:
                                                            flt]),
                                        max_results)
             for found in top.scoreDocs:

-                books.append(SearchResult(self.searcher, found, snippets=self.get_snippets(found, q)))
+                books.append(SearchResult(self.searcher, found, snippets=self.get_snippets(found, q), how_found='search_perfect_parts'))

 
         return books
 
 
         return books
 


@@ -964,7 +967,7 @@ class Search(IndexStore):
 
         topDocs = self.searcher.search(q, only_in, max_results)
         for found in topDocs.scoreDocs:
 
         topDocs = self.searcher.search(q, only_in, max_results)
         for found in topDocs.scoreDocs:

-            books.append(SearchResult(self.searcher, found))
+            books.append(SearchResult(self.searcher, found, how_found='search_everywhere_themesXcontent'))

             print "* %s theme x content: %s" % (searched, books[-1]._hits)
 
         # query themes/content x author/title/tags
             print "* %s theme x content: %s" % (searched, books[-1]._hits)
 
         # query themes/content x author/title/tags


@@ -983,7 +986,7 @@ class Search(IndexStore):
 
         topDocs = self.searcher.search(q, only_in, max_results)
         for found in topDocs.scoreDocs:
 
         topDocs = self.searcher.search(q, only_in, max_results)
         for found in topDocs.scoreDocs:

-            books.append(SearchResult(self.searcher, found))
+            books.append(SearchResult(self.searcher, found, how_found='search_everywhere'))

             print "* %s scatter search: %s" % (searched, books[-1]._hits)
 
         return books
             print "* %s scatter search: %s" % (searched, books[-1]._hits)
 
         return books

diff --git a/apps/search/templatetags/__init__.py b/apps/search/templatetags/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/apps/search/templatetags/search_tags.py b/apps/search/templatetags/search_tags.py
new file mode 100644 (file)
index 0000000..03e33c8
--- /dev/null
+++ b/apps/search/templatetags/search_tags.py
@@ -0,0 +1,45 @@
+# -*- 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.
+#
+# import feedparser
+# import datetime
+
+from django import template
+from django.template import Node, Variable
+from django.utils.encoding import smart_str
+from django.core.urlresolvers import reverse
+# from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
+# from django.db.models import Q
+from django.conf import settings
+# from django.utils.translation import ugettext as _
+from catalogue.templatetags.catalogue_tags import book_wide
+from catalogue.models import Book
+# from catalogue.forms import SearchForm
+# from catalogue.utils import split_tags
+
+
+register = template.Library()
+
+
+@register.inclusion_tag('catalogue/book_searched.html')
+def book_searched(result):
+    book = Book.objects.get(pk=result.book_id)
+    vals = book_wide(book)
+
+    # snippets = []
+    # for hit in result.hits:
+    #     if hit['snippets']:
+    #         snippets.append(hit['snippets'])
+    #     elif hit['fragment']:
+    #         snippets.append(hit['fragment'].short_text)
+
+    # We don't need hits which lead to sections but do not have
+    # snippets.
+    vals['hits'] = filter(lambda h: 'fragment' in h or
+                          h['snippets'], result.hits)
+
+    for hit in vals['hits']:
+        hit['snippets'] = map(lambda s: s.replace("\n", "<br />").replace('---', '&mdash;'), hit['snippets'])
+
+    return vals

diff --git a/wolnelektury/static/css/base.css b/wolnelektury/static/css/base.css
index 5ce2f5a..556d926 100755 (executable)
--- a/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@ -57,7 +57,7 @@ h2 {
 
 .mono {
     font-family: "Andale Mono", "Lucida Sans Typewriter", "Courier New";
 
 .mono {
     font-family: "Andale Mono", "Lucida Sans Typewriter", "Courier New";

-    font-weight: bold;
+/*    font-weight: bold; */

 }
 
 .accent1 {
 }
 
 .accent1 {

diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css
index 12adda1..273cde5 100755 (executable)
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@ -15,14 +15,28 @@
 
 .book-wide-box {
     width: 98.5em;
 
 .book-wide-box {
     width: 98.5em;

+
+    /** This is a fullpage box, it must be aligned with the top menu. 
+        This corresponds to a .1em margin below **/

     margin-left: -0.1em;
 }
 
     margin-left: -0.1em;
 }
 

+/* 
+ * A mini-box wraps it's contents (image + label) in an <a>
+ * other boxes have an inner box as a wrapper.
+ */
+
+.book-box-inner {
+    /* min, so it can grow */
+    min-height: 19.75em; 
+    margin: .5em;
+}
+

 .book-mini-box a, .book-box-inner {
     display: block;
     color: black;
     border: 1px solid #ddd;
 .book-mini-box a, .book-box-inner {
     display: block;
     color: black;
     border: 1px solid #ddd;

-    height: 20em;
+/*    height: 20em; */

     padding: .8em 1em;
     margin: .1em;
     background: #fff;
     padding: .8em 1em;
     margin: .1em;
     background: #fff;


@@ -36,15 +50,17 @@
     margin: .1em;
     overflow: hidden;
 }
     margin: .1em;
     overflow: hidden;
 }

-.book-box-inner {
-    height: 19.75em;
-    margin: .5em;
-}
+

 
 .book-wide-box .book-box-inner {
 
 .book-wide-box .book-box-inner {

-    height: 24.4em;
+   /* min, so it can grow */ 
+   min-height: 24.4em;

 }
 
 }
 

+/*.book-wide-box.search-result .book-box-inner, .book-wide-box.search-result blockquote {
+    height: auto !important;
+}*/
+

 .book-mini-box img, .book-box img, .book-wide-box img {
     width: 13.9em;
     height: 19.3em;
 .book-mini-box img, .book-box img, .book-wide-box img {
     width: 13.9em;
     height: 19.3em;


@@ -197,10 +213,16 @@ ul.book-box-tools {
     vertical-align: center;
 }
 
     vertical-align: center;
 }
 

-.book-wide-box blockquote div {
+.book-wide-box blockquote div.cite-text {

     padding: 0.888em;
 }
 
     padding: 0.888em;
 }
 

+.book-wide-box blockquote p.cite-more {
+    display: inline;
+    font-size: 0.611em;
+    float: right;
+}
+

 ul.inline-items, ul.inline-items li {
     margin: 0;
     padding: 0;
 ul.inline-items, ul.inline-items li {
     margin: 0;
     padding: 0;


@@ -210,16 +232,20 @@ ul.inline-items li {
     display: inline-block;
 }
 
     display: inline-block;
 }
 

-.book-wide-box #other-tools {
+.book-wide-box .other-tools {

     float: left;
     width: 14.5em;
     margin: 6em 0 0 1.5em;
     
 }
 
     float: left;
     width: 14.5em;
     margin: 6em 0 0 1.5em;
     
 }
 

-.book-wide-box #other-download {
+.book-wide-box .other-download {

     float: left;
     width: 22.5em;
     float: left;
     width: 22.5em;

-    margin: 6em 1.5em 0em 1.5em
+    margin: 6em 1.5em 0em 1.5em;

 }
 
 }
 

+.snippets .snippet-text {
+    font-size: 1.2em;
+    margin: 1.083em 0em;
+}
\ No newline at end of file

diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css
index 85f1a40..26c13cc 100644 (file)
--- a/wolnelektury/static/css/master.css
+++ b/wolnelektury/static/css/master.css
@@ -147,6 +147,10 @@ hr {
        border-right: none;
 }
 
        border-right: none;
 }
 

+#lang-menu-items {
+    z-index: 1;
+}
+

 /* ======================== */
 /* = Footer with sponsors = */
 /* ======================== */
 /* ======================== */
 /* = Footer with sponsors = */
 /* ======================== */

diff --git a/wolnelektury/static/js/search.js b/wolnelektury/static/js/search.js
index 47b6665..5951b8b 100644 (file)
--- a/wolnelektury/static/js/search.js
+++ b/wolnelektury/static/js/search.js
@@ -43,6 +43,10 @@ var __bind = function (self, fn) {
 
     $(function() {
         $("#search").search().labelify({labelledClass: "blur"});
 
     $(function() {
         $("#search").search().labelify({labelledClass: "blur"});

+
+       $(".search-result .see-more-snippets").click(function() {
+           $(this).closest('.search-result').find('.snippets').removeClass('ui-helper-hidden');
+           });

     });
 
 
     });
 
 

diff --git a/wolnelektury/templates/catalogue/book_searched.html b/wolnelektury/templates/catalogue/book_searched.html
new file mode 100644 (file)
index 0000000..d719f30
--- /dev/null
+++ b/wolnelektury/templates/catalogue/book_searched.html
@@ -0,0 +1,34 @@
+{% extends "catalogue/book_wide.html" %}
+{% load i18n %}
+
+
+{% block box-class %}book-wide-box search-result{% endblock %}
+
+{% block quote %}
+{% if hits.0.snippets %}
+  <div class="cite-text"><a href="{% url book_text book.slug %}#f{{hits.0.section_number}}">{{hits.0.snippets.0|safe}}</a></div>
+{% else %}{% if hits.0.fragment %}
+  <div class="cite-text"><a href="{{hits.0.fragment.get_absolute_url}}">{{hits.0.fragment.short_text|safe}}</a></div>
+{% endif %}{% endif %}
+
+{% if hits.1 %}
+  <p class="cite-more mono"><a class="see-more-snippets" href="#snippets-{{book.id}}">{% trans "See more" %}</a></p>
+{% endif %}
+{% endblock %}
+
+
+{% block box-append %}
+<div class="snippets ui-helper-hidden">
+<a name="snippets-{{book.id}}">
+{% for hit in hits %}
+  {% if hit.snippets %}
+    <div class="snippet-text"><a href="{% url book_text book.slug %}#f{{hit.section_number}}">{{hit.snippets.0|safe}}</a></div>
+  {% else %}
+    {% if hit.fragment %}
+      <div class="snippet-text"><a href="{{hit.fragment.get_absolute_url}}">{{hit.fragment.short_text|safe}}</a></div>
+    {% endif %}
+  {% endif %}
+{% endfor %}
+</a>
+</div>
+{% endblock %}

diff --git a/wolnelektury/templates/catalogue/book_wide.html b/wolnelektury/templates/catalogue/book_wide.html
index 0506c8e..bbdd333 100644 (file)
--- a/wolnelektury/templates/catalogue/book_wide.html
+++ b/wolnelektury/templates/catalogue/book_wide.html
@@ -6,11 +6,13 @@
 {% block right-column %}
 <div class="right-column">
   <blockquote id="quote" class="cite-body">
 {% block right-column %}
 <div class="right-column">
   <blockquote id="quote" class="cite-body">

+    {% block quote %}

     <div>Ten, który walczy z potworami powinien zadbać, by sam nie stał się potworem. 
     Gdy długo spoglądamy w otchłań, otchłań spogląda również w nas.</div>
     <div>Ten, który walczy z potworami powinien zadbać, by sam nie stał się potworem. 
     Gdy długo spoglądamy w otchłań, otchłań spogląda również w nas.</div>

+    {% endblock %}

   </blockquote>
 
   </blockquote>
 

-  <div id="other-tools">
+  <div class="other-tools">

     <h2 class="mono">{% trans "See" %}</h2>
     <ul class="inline-items">
       {% if extra_info.source_url %}
     <h2 class="mono">{% trans "See" %}</h2>
     <ul class="inline-items">
       {% if extra_info.source_url %}


@@ -27,7 +29,7 @@
       {% endif %}
     </ul>
   </div>
       {% endif %}
     </ul>
   </div>

-  <div id="other-download">
+  <div class="other-download">

     <h2 class="mono">{% trans "Download" %}</h2>
     <ul class="inline-items">
       <li>
     <h2 class="mono">{% trans "Download" %}</h2>
     <ul class="inline-items">
       <li>

diff --git a/wolnelektury/templates/catalogue/search_multiple_hits.html b/wolnelektury/templates/catalogue/search_multiple_hits.html
index 7a3e580..5d22251 100644 (file)
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -1,75 +1,23 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% extends "base.html" %}
 {% load i18n %}

-{% load catalogue_tags pagination_tags %}
+{% load search_tags pagination_tags %}

 
 {% block titleextra %}{% trans "Search" %}{% endblock %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
 
 {% block titleextra %}{% trans "Search" %}{% endblock %}
 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}

-    <h1>{% trans "Search" %}</h1>
-

     {% if did_you_mean %}
       <span class="did_you_mean">{% trans "Dod you mean" %} <a href="{% url search %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a></b>?</span>
     {% endif %}
     {% if did_you_mean %}
       <span class="did_you_mean">{% trans "Dod you mean" %} <a href="{% url search %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a></b>?</span>
     {% endif %}

+    <!-- tu pójdą trafienia w tagi: Autorzy - z description oraz motywy i rodzaje (z book_count) -->
+

     <div id="results">
     <div id="results">

-      <ol>

       {% for result in results %}
       {% for result in results %}

-      <li>
-       <p><a href="{{result.book.get_absolute_url}}">{{result.book.pretty_title}}</a> (id: {{result.book_id}}, score: {{result.score}})</p>
-       <ul>
-         {% for hit in result.hits %}
-         <li>
-           {% if hit.fragment %}
-           <a href="{{hit.fragment.get_absolute_url}}">Idź do fragmentu</a>
-           <div style="">Tagi/Motywy: {% for tag in hit.themes %}{{tag.name}} {% endfor %}</div>
-           {# snippets or short html? #}
-           {% if hit.snippets %}
-            {% for snip in hit.snippets %}
-              {{snip|safe}}<br/>
-            {% endfor %}
-           {% else %}
-            {{hit.fragment.short_text|safe}}
-           {% endif %}
-           
-           {% else %}
-           {# it's a section #}
-           <a href="{% url book_text result.book.slug %}#f{{hit.section_number}}">{{hit.header_index}}</a>
-            {% if hit.snippets %}
-             {% for snip in hit.snippets %}
-               {{snip|safe}}<br/>
-             {% endfor %}
-            {% else %}
-              [section matched but no snippets :-(]
-            {% endif %}
-           {% endif %}
-         </li>
-         {% endfor %}
-
-       </ul>
-      </li>
-      {% empty %}
-      <p>No results.</p>
+        {% book_searched result %}

       {% endfor %}
       {% endfor %}

-      </ol>

     </div>
 
 
     </div>
 
 

-{% comment %}
-    <div id="books-list">
-        <p>{% trans "More than one result matching the criteria found." %}</p>
-        <ul class='matches'>
-        {% for match, link, type in results %}
-          <li>{% trans type %}: <a href='{{ link }}'>
-            {% ifequal type "book" %}
-                {% book_title match %}
-            {% else %}
-                {{ match.name }}
-            {% endifequal %}
-          </a></li>
-        {% endfor %}
-        </ul>
-    </div>
-{% endcomment %}

 
 {% endblock %}
 
 {% endblock %}