Search genres by name and title

diff --git a/docs-ru/command_line.rst b/docs-ru/command_line.rst
index 140e330b0f4ce900ef1267256e13ff84b9c40955..6fc5f877b309cd4e19965f519fd485a859af188e 100644 (file)
--- a/docs-ru/command_line.rst
+++ b/docs-ru/command_line.rst
@@ -102,4 +102,18 @@ ml-search.py
 
 Искать и печатать список расширений имён файлов по имени.
 
+Поиск жанров
+^^^^^^^^^^^^
+
+Использование::
+
+    ml-search.py [-i] [-I] [-t ...] genres [-n name] [-t title]
+
+Искать и печатать список жанров по имени и заголовку.
+
+Опции::
+
+    -n, --name имя         Искать по названию
+    -t, --title заголовок  Искать по заголовку
+
 .. vim: set tw=72 :

diff --git a/docs/command_line.rst b/docs/command_line.rst
index bb3b8a264f29b79db881bc87b9b004178aced579..2697d50d64e7b99b188a01cd2f9b05c6f69acb33 100644 (file)
--- a/docs/command_line.rst
+++ b/docs/command_line.rst
@@ -100,4 +100,18 @@ Usage::
 
 Search and print a list of extensions by name.
 
+Genres search
+^^^^^^^^^^^^^
+
+Usage::
+
+    ml-search.py [-i] [-I] [-t ...] genres [-n name] [-t title]
+
+Search and print a list of genres by name and title.
+
+Options::
+
+    -n, --name name    Search by name
+    -t, --title title  Search by title
+
 .. vim: set tw=72 :

diff --git a/m_librarian/db.py b/m_librarian/db.py
index c06fab81b6e3858ec1b72956b21a490bf3bdfeb7..771fd57270a18a33b1a95bddb76d37cbc75cce7a 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -82,7 +82,7 @@ class Extension(SQLObject):
 
 
 class Genre(SQLObject):
-    name = StringCol(notNull=True, unique=True)
+    name = UnicodeCol(notNull=True, unique=True)
     title = UnicodeCol(notNull=True)
     count = IntCol(notNull=True)
     books = RelatedJoin('Book', otherColumn='book_id',

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index 47b1a8ca7f6d278551a3f9e9df312f139accd975..ef396fdbc742898ed439f64fe4f0385cf7851932 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -6,7 +6,8 @@ from sqlobject.sqlbuilder import CONCAT
 
 from m_lib.defenc import default_encoding
 from m_librarian.db import Author, open_db
-from m_librarian.search import search_authors, search_extensions
+from m_librarian.search import search_authors, search_extensions, \
+    search_genres
 
 from m_librarian.translations import translations
 _ = translations.ugettext
@@ -58,6 +59,22 @@ def _search_extensions(case_sensitive, args):
             (u"(%s: %d)" % (_('books'), ext.count)).encode(default_encoding)
 
 
+def _search_genres(case_sensitive, args):
+    values = {}
+    expressions = []
+    for column in 'name', 'title':
+        value = getattr(args, column)
+        if value:
+            values[column] = unicode(value, default_encoding)
+    if case_sensitive is None:
+        case_sensitive = _guess_case_sensitivity(values)
+    for genre in search_genres(args.search_type, case_sensitive, values):
+        names = filter(None, (genre.name, genre.title))
+        fullname = u' '.join(names)
+        print fullname.encode(default_encoding), \
+            (u"(%s: %d)" % (_('books'), genre.count)).encode(default_encoding)
+
+
 if __name__ == '__main__':
     main_parser = argparse.ArgumentParser(description='Search')
     main_parser.add_argument('-i', '--ignore-case',
@@ -86,6 +103,11 @@ if __name__ == '__main__':
     parser.add_argument('name', help='search by name')
     parser.set_defaults(func=_search_extensions)
 
+    parser = subparsers.add_parser('genres', help='Search genres')
+    parser.add_argument('-n', '--name', help='search by name')
+    parser.add_argument('-t', '--title', help='search by title')
+    parser.set_defaults(func=_search_genres)
+
     args = main_parser.parse_args()
     if args.case_sensitive:
         if args.ignore_case: