chmod docs for sdist

[m_librarian.git] / m_librarian / search.py

diff --git a/m_librarian/search.py b/m_librarian/search.py
index 5b289f089b3f303f7465d3c28c70dd7722a937a2..d431c30d1bc354c4f2b708dc28017631500ace4e 100644 (file)
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,31 +1,37 @@
 
+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():
-            _expressions.append(
-                getattr(getattr(table.q, column), comparison_op)(value))
+            if column != 'id':
+                _expressions.append(
+                    getattr(getattr(table.q, column), comparison_op)(value))
         for expr, value in expressions:
             _expressions.append(
                 getattr(expr, comparison_op)(value))
     else:
         for column, value in values.items():
-            _expressions.append(
-                getattr(func.lower(
-                    getattr(table.q, column)), comparison_op)(value.lower()))
+            if column != 'id':
+                _expressions.append(
+                    getattr(func.lower(
+                        getattr(table.q, column)),
+                        comparison_op)(value.lower()))
         for expr, value in expressions:
             _expressions.append(
                 getattr(func.lower(expr), comparison_op)(value.lower()))
@@ -40,28 +46,32 @@ _search_conditions_dict = {
 
 
 def mk_search_conditions(table, search_type, case_sensitive, values,
-                         expressions=None):
+                         expressions=None, join_expressions=None):
+    if join_expressions is None:
+        join_expressions = []
     return _mk_search_conditions_with_operator(
         table, case_sensitive, _search_conditions_dict[search_type],
-        values, expressions)
+        values, expressions) + join_expressions
 
 
 def _search(table, search_type, case_sensitive, values,
-            expressions=None, orderBy=None):
+            expressions=None, join_expressions=None, orderBy=None):
     conditions = mk_search_conditions(
-        table, search_type, case_sensitive, values, expressions=expressions)
+        table, search_type, case_sensitive, values, expressions=expressions,
+        join_expressions=join_expressions)
     return table.select(AND(*conditions), orderBy=orderBy)
 
 
 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, orderBy=None):
+def search_books(search_type, case_sensitive, values, join_expressions=None,
+                 orderBy=None):
     return _search(Book, search_type, case_sensitive, values,
-                   orderBy=orderBy)
+                   join_expressions=join_expressions, orderBy=orderBy)
 
 
 def search_extensions(search_type, case_sensitive, values, orderBy=None):