X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=5c1f47d65403df60bc645a144728a5c24b2076c5;hb=4d962da67832d827fd1652037f74f0b47974067c;hp=635f194de1571e9927ae55d6f172f736249a1a79;hpb=d6ef04787834ffeded257d96af4c965ca7055a51;p=m_librarian.git diff --git a/m_librarian/search.py b/m_librarian/search.py index 635f194..5c1f47d 100644 --- a/m_librarian/search.py +++ b/m_librarian/search.py @@ -14,8 +14,14 @@ def _mk_search_conditions_with_operator(table, case_sensitive, comparison_op, if expressions is None: expressions = [] _expressions = [] + for column, value in values.items(): + if column == 'id': + _expressions.append(table.q.id == value) + break 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,16 +29,19 @@ 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())) return _expressions -_search_conditions_dict = { +_comparison_operators = { 'start': 'startswith', 'substring': 'contains', 'full': '__eq__', @@ -44,7 +53,7 @@ def mk_search_conditions(table, search_type, case_sensitive, values, if join_expressions is None: join_expressions = [] return _mk_search_conditions_with_operator( - table, case_sensitive, _search_conditions_dict[search_type], + table, case_sensitive, _comparison_operators[search_type], values, expressions) + join_expressions