X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=5c1f47d65403df60bc645a144728a5c24b2076c5;hb=c0bcecfb40d61f569558e2aeb428e860427acb4a;hp=7572287759616f11cb2c7353dbc3779cabc6e61c;hpb=5126c1afb98575a2430d188ad20a6cc6d5627acb;p=m_librarian.git

diff --git a/m_librarian/search.py b/m_librarian/search.py
index 7572287..5c1f47d 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,21 +1,27 @@
 
+from sqlobject.sqlbuilder import AND, func
+from .db import Author, Book, Extension, Genre, Language
+
 __all__ = [
     'mk_search_conditions',
     'search_authors', 'search_books', 'search_extensions',
     'search_genres', 'search_languages',
 ]
 
-from sqlobject.sqlbuilder import AND, func
-from .db import Author, Book, Extension, Genre, Language
-
 
 def _mk_search_conditions_with_operator(table, case_sensitive, comparison_op,
                                         values, expressions):
     if expressions is None:
         expressions = []
     _expressions = []
+    for column, value in values.items():
+        if column == 'id':
+            _expressions.append(table.q.id == value)
+            break
     if case_sensitive:
         for column, value in values.items():
+            if column == 'id':
+                continue
             _expressions.append(
                 getattr(getattr(table.q, column), comparison_op)(value))
         for expr, value in expressions:
@@ -23,16 +29,19 @@ def _mk_search_conditions_with_operator(table, case_sensitive, comparison_op,
                 getattr(expr, comparison_op)(value))
     else:
         for column, value in values.items():
+            if column == 'id':
+                continue
             _expressions.append(
                 getattr(func.lower(
-                    getattr(table.q, column)), comparison_op)(value.lower()))
+                    getattr(table.q, column)),
+                    comparison_op)(value.lower()))
         for expr, value in expressions:
             _expressions.append(
                 getattr(func.lower(expr), comparison_op)(value.lower()))
     return _expressions
 
 
-_search_conditions_dict = {
+_comparison_operators = {
     'start': 'startswith',
     'substring': 'contains',
     'full': '__eq__',
@@ -44,7 +53,7 @@ def mk_search_conditions(table, search_type, case_sensitive, values,
     if join_expressions is None:
         join_expressions = []
     return _mk_search_conditions_with_operator(
-        table, case_sensitive, _search_conditions_dict[search_type],
+        table, case_sensitive, _comparison_operators[search_type],
         values, expressions) + join_expressions
 
 
@@ -59,7 +68,7 @@ def _search(table, search_type, case_sensitive, values,
 def search_authors(search_type, case_sensitive, values,
                    expressions=None, orderBy=None):
     return _search(Author, search_type, case_sensitive, values,
-                   expressions=None, orderBy=orderBy)
+                   expressions=expressions, orderBy=orderBy)
 
 
 def search_books(search_type, case_sensitive, values, join_expressions=None,