-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, expressions):
- _search_f = globals()['_search_%s' % search_type]
- conditions = _search_f(table, case_sensitive, values, expressions)
- return table.select(conditions)
+def _search(table, search_type, case_sensitive, values,
+ expressions=None, orderBy=None):
+ conditions = mk_search_conditions(
+ table, search_type, case_sensitive, values, expressions=expressions)
+ return table.select(AND(*conditions), orderBy=orderBy)