X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=c190dc8aa3f2bcb858259671b4f0fbf6d847d274;hb=f1e5552af5ec0775c4d3569dda92b4ac9eb41d7b;hp=1405e09dac6fe582a7c1ce3f0fd9efbe15cb0021;hpb=5932dd9301f9820b2b103545593606909f8eceb8;p=m_librarian.git

diff --git a/m_librarian/search.py b/m_librarian/search.py
index 1405e09..c190dc8 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,9 +1,5 @@
-try:
-    from configparser import NoSectionError, NoOptionError
-except ImportError:  # Python 2
-    from ConfigParser import NoSectionError, NoOptionError
+from sqlobject.sqlbuilder import AND, OR, func, CONCAT
 
-from sqlobject.sqlbuilder import AND, OR, func
 from .config import get_config
 from .db import Author, Book, Extension, Genre, Language
 
@@ -80,19 +76,13 @@ def search_books(search_type, case_sensitive, values, join_expressions=None,
                  orderBy=None, use_filters=False):
     if use_filters:
         config = get_config()
-        try:
-            lang_filter = config.get('filters', 'lang')
-        except (NoSectionError, NoOptionError):
-            lang_filter = None
-        try:
-            deleted_filter = config.getint('filters', 'deleted')
-        except (NoSectionError, NoOptionError):
-            deleted_filter = None
+        lang_filter = config.getlist('filters', 'lang')
+        deleted_filter = config.getint('filters', 'deleted')
         if lang_filter:
             if join_expressions is None:
                 join_expressions = []
             lang_conditions = []
-            for lang in lang_filter.split():
+            for lang in lang_filter:
                 lvalues = {'name': lang}
                 conditions = mk_search_conditions(
                     Language, search_type, case_sensitive, lvalues)
@@ -120,3 +110,83 @@ def search_genres(search_type, case_sensitive, values, orderBy=None):
 def search_languages(search_type, case_sensitive, values, orderBy=None):
     return _search(Language, search_type, case_sensitive, values,
                    orderBy=orderBy)
+
+
+def decode(value):
+    if isinstance(value, bytes):
+        return value.decode('utf-8')
+    return value
+
+
+def _guess_case_sensitivity(value):
+    return not value.islower()
+
+
+def search_authors_raw(value, search_type, case_sensitive):
+    value = decode(value)
+    if not search_type:
+        search_type = 'start'
+    if case_sensitive is None:
+        case_sensitive = _guess_case_sensitivity(value)
+    expressions = [(
+        CONCAT(Author.q.surname, ' ', Author.q.name, ' ', Author.q.misc_name),
+        decode(value)
+    )]
+    authors = search_authors(search_type, case_sensitive, {}, expressions,
+                             orderBy=('surname', 'name', 'misc_name'))
+    columns = get_config().getlist('columns', 'author', ['fullname'])
+    return {
+        'authors': list(authors),
+        'search_authors': value,
+        'search_type': search_type,
+        'case_sensitive': case_sensitive,
+        'columns': columns,
+    }
+
+
+def books_by_author(aid):
+    use_filters = get_config().getint('filters', 'use_in_books_list', 1)
+    columns = get_config().getlist('columns', 'book', ['title'])
+    author = Author.get(aid)
+    if use_filters:
+        join_expressions = []
+        join_expressions.append(Book.j.authors)
+        join_expressions.append(Author.q.id == aid)
+        books = search_books('full', None, {}, join_expressions,
+                             orderBy=('series', 'ser_no', 'title', '-date'),
+                             use_filters=use_filters)
+    else:
+        books = Book.select(
+            Book.j.authors & (Author.q.id == aid),
+            orderBy=['series', 'ser_no', 'title'],
+        )
+    return {
+        'books_by_author': {author.fullname: list(books)},
+        'columns': columns,
+    }
+
+
+def search_books_raw(value, search_type, case_sensitive, use_filters):
+    value = decode(value)
+    if not search_type:
+        search_type = 'start'
+    if case_sensitive is None:
+        case_sensitive = _guess_case_sensitivity(value)
+    books = search_books(search_type, case_sensitive, {'title': value}, None,
+                         orderBy=('title',), use_filters=use_filters)
+    books_by_authors = {}
+    for book in books:
+        author = book.author1
+        if author in books_by_authors:
+            books_by_author = books_by_authors[author]
+        else:
+            books_by_author = books_by_authors[author] = []
+        books_by_author.append(book)
+    columns = get_config().getlist('columns', 'book', ['title'])
+    return {
+        'books_by_author': books_by_authors,
+        'search_books': value,
+        'search_type': search_type,
+        'case_sensitive': case_sensitive,
+        'columns': columns,
+    }