+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:
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()))
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,