X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=5c1f47d65403df60bc645a144728a5c24b2076c5;hb=34b5437b097b0cfa0b87471029d14308106e3862;hp=d431c30d1bc354c4f2b708dc28017631500ace4e;hpb=cf773e9ae70a7a1cbdd27e234db3834c3c07d649;p=m_librarian.git

diff --git a/m_librarian/search.py b/m_librarian/search.py
index d431c30..5c1f47d 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -17,28 +17,31 @@ def _mk_search_conditions_with_operator(table, case_sensitive, comparison_op,
     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':
-                _expressions.append(
-                    getattr(getattr(table.q, column), comparison_op)(value))
+            if column == 'id':
+                continue
+            _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():
-            if column != 'id':
-                _expressions.append(
-                    getattr(func.lower(
-                        getattr(table.q, column)),
-                        comparison_op)(value.lower()))
+            if column == 'id':
+                continue
+            _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 _expressions
 
 
-_search_conditions_dict = {
+_comparison_operators = {
     'start': 'startswith',
     'substring': 'contains',
     'full': '__eq__',
@@ -50,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