Search: manage complex queries - Find search: loan status

1 files changed, 41 insertions, 8 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 2d8b6b828..85db87605 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -339,6 +339,12 @@ def _push_to_list(obj, current_group, depth):
         current_group.append(obj)
 
 
+def is_true_string(val):
+    val = unicode(val).lower().replace(u'"', u"")
+    if val in (u"1", u"true", unicode(_(u"True")).lower()):
+        return True
+
+
 def _parse_parentheses(s):
     """
     Parse parentheses into list.
@@ -382,14 +388,31 @@ def _parse_query_string(string, request_keys, current_dct, exc_dct):
             if excluded:
                 term = term[1:]
             if term in request_keys:
-                term = request_keys[term]
                 dct = current_dct
-                if excluded:
-                    dct = exc_dct
-                if term in dct:
-                    dct[term] += u";" + query
+                term = request_keys[term]
+                # callable request key for complex queries
+                if callable(term):
+                    is_true = is_true_string(query)
+                    if excluded:
+                        is_true = not is_true
+                    cfltr, cexclude, cextra = term(is_true=is_true)
+                    if cfltr:
+                        if 'and_reqs' not in dct:
+                            dct['and_reqs'] = []
+                        dct['and_reqs'].append(cfltr)
+                    if cexclude:
+                        if 'exc_and_reqs' not in dct:
+                            dct['exc_and_reqs'] = []
+                        dct['exc_and_reqs'].append(cexclude)
+                    if cextra:
+                        dct['extras'].append(cextra)
                 else:
-                    dct[term] = query
+                    if excluded:
+                        dct = exc_dct
+                    if term in dct:
+                        dct[term] += u";" + query
+                    else:
+                        dct[term] = query
                 return u""
     for reserved_char in FORBIDDEN_CHAR:
         string = string.replace(reserved_char, u"")
@@ -809,7 +832,12 @@ def _construct_query(relation_types, dct, or_reqs, and_reqs):
         query |= Q(**alt_dct)
     query = _manage_relation_types(relation_types, dct, query, or_reqs)
 
+    done = []
     for and_req in and_reqs:
+        str_q = unicode(and_req)
+        if str_q in done:
+            continue
+        done.append(str_q)
         query = query & and_req
     return query
 
@@ -1068,6 +1096,7 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
         excluded_dct = {}
         and_reqs, or_reqs = [], []
         exc_and_reqs, exc_or_reqs = [], []
+        dct['extras'], dct['and_reqs'], dct['exc_and_reqs'] = [], [], []
 
         if full == 'shortcut':
             if model.SLUG == "warehouse":
@@ -1086,7 +1115,10 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
             if not val:
                 continue
             req_keys = request_keys[k]
-            if type(req_keys) not in (list, tuple):
+            if callable(req_keys):
+                # callable request key for complex queries not managed on GET
+                continue
+            elif type(req_keys) not in (list, tuple):
                 dct[req_keys] = val
                 continue
             # multiple choice target
@@ -1109,7 +1141,6 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
         else:
             request.session[func_name] = dct
 
-        dct['extras'] = []
         dct, excluded_dct = _search_manage_search_vector(
             model, dct, excluded_dct, request_keys)
         search_vector = ""
@@ -1146,6 +1177,8 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
         _manage_facet_search(model, excluded_dct, exc_and_reqs)
 
         extras = dct.pop('extras')
+        and_reqs += dct.pop('and_reqs')
+        exc_and_reqs += dct.pop('exc_and_reqs')
 
         _manage_clean_search_field(dct)
         _manage_clean_search_field(excluded_dct)