Search languages by name

diff --git a/docs-ru/command_line.rst b/docs-ru/command_line.rst
index 6fc5f877b309cd4e19965f519fd485a859af188e..b219022c16fad21cdd414fc9efafb48dacc4dfd0 100644 (file)
--- a/docs-ru/command_line.rst
+++ b/docs-ru/command_line.rst
@@ -116,4 +116,13 @@ ml-search.py
     -n, --name имя         Искать по названию
     -t, --title заголовок  Искать по заголовку
 
+Поиск языков
+^^^^^^^^^^^^
+
+Использование::
+
+    ml-search.py [-i] [-I] [-t ...] lang name
+
+Искать и печатать список языков по имени.
+
 .. vim: set tw=72 :

diff --git a/docs/command_line.rst b/docs/command_line.rst
index 2697d50d64e7b99b188a01cd2f9b05c6f69acb33..ca386bd819d0a351b2acd8f9844eedaff3560f3b 100644 (file)
--- a/docs/command_line.rst
+++ b/docs/command_line.rst
@@ -114,4 +114,13 @@ Options::
     -n, --name name    Search by name
     -t, --title title  Search by title
 
+Language search
+^^^^^^^^^^^^^^^
+
+Usage::
+
+    ml-search.py [-i] [-I] [-t ...] lang name
+
+Search and print a list of languages by name.
+
 .. vim: set tw=72 :

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index ef396fdbc742898ed439f64fe4f0385cf7851932..e4ae0119fe58127de3b5c43515582063d1eb1ead 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -7,7 +7,7 @@ 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, \
-    search_genres
+    search_genres, search_languages
 
 from m_librarian.translations import translations
 _ = translations.ugettext
@@ -75,6 +75,15 @@ def _search_genres(case_sensitive, args):
             (u"(%s: %d)" % (_('books'), genre.count)).encode(default_encoding)
 
 
+def _search_languages(case_sensitive, args):
+    values = {'name': args.name}
+    if case_sensitive is None:
+        case_sensitive = _guess_case_sensitivity(values)
+    for lang in search_languages(args.search_type, case_sensitive, values):
+        print lang.name.encode(default_encoding), \
+            (u"(%s: %d)" % (_('books'), lang.count)).encode(default_encoding)
+
+
 if __name__ == '__main__':
     main_parser = argparse.ArgumentParser(description='Search')
     main_parser.add_argument('-i', '--ignore-case',
@@ -108,6 +117,10 @@ if __name__ == '__main__':
     parser.add_argument('-t', '--title', help='search by title')
     parser.set_defaults(func=_search_genres)
 
+    parser = subparsers.add_parser('lang', help='Search languages')
+    parser.add_argument('name', help='search by name')
+    parser.set_defaults(func=_search_languages)
+
     args = main_parser.parse_args()
     if args.case_sensitive:
         if args.ignore_case: