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

diff --git a/m_librarian/search.py b/m_librarian/search.py
index 7572287..2e761ed 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,21 +1,26 @@
 
+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)
     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,9 +28,12 @@ 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()))
@@ -59,7 +67,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,