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

diff --git a/m_librarian/search.py b/m_librarian/search.py
index 63078ce..5b289f0 100644
--- a/m_librarian/search.py
+++ b/m_librarian/search.py
@@ -1,5 +1,6 @@
 
 __all__ = [
+    'mk_search_conditions',
     'search_authors', 'search_books', 'search_extensions',
     'search_genres', 'search_languages',
 ]
@@ -8,8 +9,10 @@ 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 = []
     if case_sensitive:
         for column, value in values.items():
@@ -26,52 +29,51 @@ def _search_with_operator(table, case_sensitive, comparison_op, values,
         for expr, value in expressions:
             _expressions.append(
                 getattr(func.lower(expr), comparison_op)(value.lower()))
-    return AND(*_expressions)
+    return _expressions
 
 
-def _search_start(table, case_sensitive, values, expressions):
-    return _search_with_operator(table, case_sensitive, 'startswith', values,
-                                 expressions)
+_search_conditions_dict = {
+    'start': 'startswith',
+    'substring': 'contains',
+    'full': '__eq__',
+}
 
 
-def _search_substring(table, case_sensitive, values, expressions):
-    return _search_with_operator(table, case_sensitive, 'contains', values,
-                                 expressions)
-
-
-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):
+    return _mk_search_conditions_with_operator(
+        table, case_sensitive, _search_conditions_dict[search_type],
+        values, 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, orderBy=None):
+    conditions = mk_search_conditions(
+        table, search_type, case_sensitive, values, expressions=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=None, orderBy=orderBy)
 
 
 def search_books(search_type, case_sensitive, values, orderBy=None):
     return _search(Book, search_type, case_sensitive, values,
-                   [], orderBy)
+                   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)