X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fsearch.py;h=5c1f47d65403df60bc645a144728a5c24b2076c5;hb=d9a85ec552d93e4a009f729d09f4452e6b34dac5;hp=63078ced1d997ded58ccdcab2412c4cd2d123c85;hpb=9686bc5fd9b73a6f43a7753afd172a5fe5b9501a;p=m_librarian.git

diff --git a/m_librarian/search.py b/m_librarian/search.py
index 63078ce..5c1f47d 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,18 +1,27 @@
 
+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 _search_with_operator(table, case_sensitive, comparison_op, values,
-                          expressions):
+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)
+            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:
@@ -20,58 +29,64 @@ def _search_with_operator(table, case_sensitive, comparison_op, values,
                 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 AND(*_expressions)
-
-
-def _search_start(table, case_sensitive, values, expressions):
-    return _search_with_operator(table, case_sensitive, 'startswith', values,
-                                 expressions)
+    return _expressions
 
 
-def _search_substring(table, case_sensitive, values, expressions):
-    return _search_with_operator(table, case_sensitive, 'contains', values,
-                                 expressions)
+_comparison_operators = {
+    'start': 'startswith',
+    'substring': 'contains',
+    'full': '__eq__',
+}
 
 
-def _search_full(table, case_sensitive, values, expressions):
-    return _search_with_operator(table, case_sensitive, '__eq__', values,
-                                 expressions)
+def mk_search_conditions(table, search_type, case_sensitive, values,
+                         expressions=None, join_expressions=None):
+    if join_expressions is None:
+        join_expressions = []
+    return _mk_search_conditions_with_operator(
+        table, case_sensitive, _comparison_operators[search_type],
+        values, expressions) + join_expressions
 
 
 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, expressions)
-    return table.select(conditions, orderBy=orderBy)
+            expressions=None, join_expressions=None, orderBy=None):
+    conditions = mk_search_conditions(
+        table, search_type, case_sensitive, values, expressions=expressions,
+        join_expressions=join_expressions)
+    return table.select(AND(*conditions), orderBy=orderBy)
 
 
 def search_authors(search_type, case_sensitive, values,
-                   expressions, orderBy=None):
+                   expressions=None, orderBy=None):
     return _search(Author, search_type, case_sensitive, values,
-                   expressions, orderBy)
+                   expressions=expressions, orderBy=orderBy)
 
 
-def search_books(search_type, case_sensitive, values, orderBy=None):
+def search_books(search_type, case_sensitive, values, join_expressions=None,
+                 orderBy=None):
     return _search(Book, search_type, case_sensitive, values,
-                   [], orderBy)
+                   join_expressions=join_expressions, orderBy=orderBy)
 
 
 def search_extensions(search_type, case_sensitive, values, orderBy=None):
     return _search(Extension, search_type, case_sensitive, values,
-                   [], orderBy)
+                   orderBy=orderBy)
 
 
 def search_genres(search_type, case_sensitive, values, orderBy=None):
     return _search(Genre, search_type, case_sensitive, values,
-                   [], orderBy)
+                   orderBy=orderBy)
 
 
 def search_languages(search_type, case_sensitive, values, orderBy=None):
     return _search(Language, search_type, case_sensitive, values,
-                   [], orderBy)
+                   orderBy=orderBy)