from .db import Author, Book, Extension, Genre, Language
-def _search_exact(table, case_sensitive, values):
- expressions = []
+def _search_with_operator(table, case_sensitive, comparison_op, values,
+ expressions):
+ _expressions = []
if case_sensitive:
for column, value in values.items():
- expressions.append(getattr(table.q, column) == value)
+ _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(
- func.lower(getattr(table.q, column)) == value.lower())
- return AND(*expressions)
+ _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()))
+ return AND(*_expressions)
-def _search_start(table, case_sensitive, values):
- expressions = []
- if case_sensitive:
- for column, value in values.items():
- expressions.append(getattr(table.q, column).startswith(value))
- else:
- for column, value in values.items():
- expressions.append(
- func.lower(getattr(table.q, column)).startswith(value.lower()))
- return AND(*expressions)
+def _search_exact(table, case_sensitive, values, expressions):
+ return _search_with_operator(table, case_sensitive, '__eq__', values,
+ expressions)
-def _search_substring(table, case_sensitive, values):
- expressions = []
- if case_sensitive:
- for column, value in values.items():
- expressions.append(getattr(table.q, column).contains(value))
- else:
- for column, value in values.items():
- expressions.append(
- func.lower(getattr(table.q, column)).contains(value.lower()))
- return AND(*expressions)
+def _search_start(table, case_sensitive, values, expressions):
+ return _search_with_operator(table, case_sensitive, 'startswith', values,
+ expressions)
+
+
+def _search_substring(table, case_sensitive, values, expressions):
+ return _search_with_operator(table, case_sensitive, 'contains', values,
+ expressions)
-def _search(table, search_type, case_sensitive, values):
+def _search(table, search_type, case_sensitive, values,
+ expressions, orderBy=None):
_search_f = globals()['_search_%s' % search_type]
- conditions = _search_f(table, case_sensitive, values)
- return table.select(conditions)
+ conditions = _search_f(table, case_sensitive, values, expressions)
+ return table.select(conditions, orderBy=orderBy)
-def search_authors(search_type, case_sensitive, values):
- return _search(Author, search_type, case_sensitive, values)
+def search_authors(search_type, case_sensitive, values,
+ expressions, orderBy=None):
+ return _search(Author, search_type, case_sensitive, values,
+ expressions, orderBy)
-def search_books(search_type, case_sensitive, values):
- return _search(Book, search_type, case_sensitive, values)
+def search_books(search_type, case_sensitive, values, orderBy=None):
+ return _search(Book, search_type, case_sensitive, values,
+ [], orderBy)
-def search_extensions(search_type, case_sensitive, values):
- return _search(Extension, search_type, case_sensitive, values)
+def search_extensions(search_type, case_sensitive, values, orderBy=None):
+ return _search(Extension, search_type, case_sensitive, values,
+ [], orderBy)
-def search_genres(search_type, case_sensitive, values):
- return _search(Genre, search_type, case_sensitive, values)
+def search_genres(search_type, case_sensitive, values, orderBy=None):
+ return _search(Genre, search_type, case_sensitive, values,
+ [], orderBy)
-def search_languages(search_type, case_sensitive, values):
- return _search(Language, search_type, case_sensitive, values)
+def search_languages(search_type, case_sensitive, values, orderBy=None):
+ return _search(Language, search_type, case_sensitive, values,
+ [], orderBy)