src/p4l/search/query_parser.py
author ymh <ymh.work@gmail.com>
Tue, 01 Oct 2013 02:53:54 +0200
changeset 131 f1854630734f
parent 126 a345f1a67bf1
permissions -rw-r--r--
change copyright notice
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
115
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
     1
# -*- coding: utf-8 -*-
126
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
     2
#
131
f1854630734f change copyright notice
ymh <ymh.work@gmail.com>
parents: 126
diff changeset
     3
# Copyright IRI (c) 2013
126
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
     4
#
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
     5
# contact@iri.centrepompidou.fr
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
     6
#
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
     7
# This software is governed by the CeCILL-B license under French law and
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
     8
# abiding by the rules of distribution of free software.  You can  use, 
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
     9
# modify and/ or redistribute the software under the terms of the CeCILL-B
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    10
# license as circulated by CEA, CNRS and INRIA at the following URL
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    11
# "http://www.cecill.info". 
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    12
#
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    13
# As a counterpart to the access to the source code and  rights to copy,
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    14
# modify and redistribute granted by the license, users are provided only
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    15
# with a limited warranty  and the software's author,  the holder of the
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    16
# economic rights,  and the successive licensors  have only  limited
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    17
# liability. 
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    18
#
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    19
# In this respect, the user's attention is drawn to the risks associated
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    20
# with loading,  using,  modifying and/or developing or reproducing the
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    21
# software by the user in light of its specific status of free software,
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    22
# that may mean  that it is complicated to manipulate,  and  that  also
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    23
# therefore means  that it is reserved for developers  and  experienced
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    24
# professionals having in-depth computer knowledge. Users are therefore
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    25
# encouraged to load and test the software's suitability as regards their
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    26
# requirements in conditions enabling the security of their systems and/or 
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    27
# data to be ensured and,  more generally, to use and operate it in the 
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    28
# same conditions as regards security. 
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    29
#
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    30
# The fact that you are presently reading this means that you have had
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    31
# knowledge of the CeCILL-B license and that you accept its terms.
a345f1a67bf1 Python licence headers
ymh <ymh.work@gmail.com>
parents: 115
diff changeset
    32
#
115
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    33
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    34
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    35
from django.conf import settings
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    36
from haystack.query import SQ
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    37
from whoosh.qparser import (SimpleParser, FieldsPlugin, OperatorsPlugin, 
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    38
    PhrasePlugin, SingleQuotePlugin, GroupPlugin, PrefixPlugin, GtLtPlugin, 
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    39
    RangePlugin)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    40
from whoosh.query import (Term, And, AndMaybe, Or, AndNot, Not, Phrase, Prefix, 
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    41
    TermRange)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    42
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    43
HAYSTACK_DEFAULT_OPERATOR = getattr(settings,'HAYSTACK_DEFAULT_OPERATOR','AND')
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    44
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    45
class QueryParser(object):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    46
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    47
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    48
    def __init__(self, fieldname):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    49
        '''
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    50
        Constructor
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    51
        '''
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    52
        self.w_parser = SimpleParser(fieldname, None)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    53
        self.w_parser.add_plugin(FieldsPlugin())
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    54
        self.w_parser.add_plugin(OperatorsPlugin())
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    55
        self.w_parser.add_plugin(PhrasePlugin())
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    56
        self.w_parser.add_plugin(SingleQuotePlugin())
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    57
        self.w_parser.add_plugin(GroupPlugin())
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    58
        self.w_parser.add_plugin(PrefixPlugin())
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    59
        self.w_parser.add_plugin(GtLtPlugin())
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    60
        self.w_parser.add_plugin(RangePlugin())
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    61
        self.query = None
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    62
        self.current_node_stack = []        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    63
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    64
    def parse(self, query):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    65
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    66
        self.query = SQ()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    67
        self.current_node_stack = [(self.query, HAYSTACK_DEFAULT_OPERATOR)]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    68
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    69
        wquery = self.w_parser.parse(query)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    70
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    71
        self.visit(wquery)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    72
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    73
        if len(self.query) == 1 and isinstance(self.query.children[0], SQ):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    74
            return self.query.children[0]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    75
        else:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    76
            return self.query 
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    77
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    78
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    79
    def visit(self, q):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    80
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    81
        if isinstance(q, Term):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    82
            current_node, current_connector = self.current_node_stack.pop() 
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    83
            current_node.add(SQ(**{q.fieldname:q.text}), current_connector)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    84
            self.current_node_stack.append((current_node,current_connector))
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    85
        elif isinstance(q, And):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    86
            self._add_compound_query(q, SQ.AND)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    87
        elif isinstance(q, AndMaybe):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    88
            self._add_andmaybe(q)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    89
        elif isinstance(q, Or):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    90
            self._add_compound_query(q, SQ.OR)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    91
        elif isinstance(q, AndNot):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    92
            self._add_andnot(q)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    93
        elif isinstance(q, Not):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    94
            self._add_not(q)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    95
        elif isinstance(q, Phrase):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    96
            self._add_phrase(q)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    97
        elif isinstance(q, Prefix):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    98
            self._add_prefix(q)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
    99
        elif isinstance(q, TermRange):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   100
            self._add_range(q)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   101
            
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   102
    def _add_compound_query(self, q, connector):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   103
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   104
        new_node = SQ()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   105
        self.current_node_stack.append((new_node, connector))
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   106
        for subquery in q.subqueries:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   107
            self.visit(subquery)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   108
        self.current_node_stack.pop()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   109
                        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   110
        if len(new_node)==1 and isinstance(new_node.children[0], SQ) :
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   111
            new_node = new_node.children[0]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   112
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   113
        current_node, current_connector = self.current_node_stack[-1]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   114
        current_node.add(new_node, current_connector)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   115
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   116
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   117
    def _add_andnot(self, q):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   118
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   119
        new_node = SQ()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   120
        self.current_node_stack.append((new_node, SQ.AND))
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   121
        self.visit(q.a)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   122
        self.visit(Not(q.b))
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   123
        self.current_node_stack.pop()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   124
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   125
        if len(new_node)==1 and isinstance(new_node.children[0], SQ) :
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   126
            new_node = new_node.children[0]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   127
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   128
        current_node, current_connector = self.current_node_stack[-1]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   129
        current_node.add(new_node, current_connector)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   130
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   131
    def _add_andmaybe(self, q):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   132
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   133
        new_node = SQ()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   134
        self.current_node_stack.append((new_node, SQ.AND))
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   135
        self.visit(q.a)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   136
        self.visit(q.b)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   137
        self.current_node_stack.pop()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   138
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   139
        if len(new_node)==1 and isinstance(new_node.children[0], SQ) :
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   140
            new_node = new_node.children[0]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   141
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   142
        current_node, current_connector = self.current_node_stack[-1]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   143
        current_node.add(new_node, current_connector)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   144
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   145
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   146
    def _add_not(self, q):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   147
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   148
        new_node = SQ()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   149
        self.current_node_stack.append((new_node, SQ.AND))
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   150
        self.visit(q.query)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   151
        self.current_node_stack.pop()
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   152
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   153
        if len(new_node)==1 and isinstance(new_node.children[0], SQ) :
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   154
            new_node = new_node.children[0]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   155
            
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   156
        current_node, current_connector = self.current_node_stack[-1]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   157
        current_node.add(~new_node, current_connector)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   158
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   159
    def _add_phrase(self, q):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   160
        new_node = SQ(**{q.fieldname+"__exact":" ".join(q.words)})            
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   161
        current_node, current_connector = self.current_node_stack[-1]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   162
        current_node.add(new_node, current_connector)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   163
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   164
    def _add_prefix(self, q):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   165
        new_node = SQ(**{q.fieldname+"__startswith":q.text})            
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   166
        current_node, current_connector = self.current_node_stack[-1]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   167
        current_node.add(new_node, current_connector)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   168
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   169
    def _add_range(self, q):
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   170
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   171
        if q.start is None:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   172
            if q.endexcl:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   173
                postfix = "__lt"
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   174
            else:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   175
                postfix = "__lte"
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   176
            new_node = SQ(**{q.fieldname+postfix:self.__convert_nb(q.end)})
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   177
        elif q.end is None:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   178
            if q.startexcl:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   179
                postfix = "__gt"
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   180
            else:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   181
                postfix = "__gte"
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   182
            new_node = SQ(**{q.fieldname+postfix:self.__convert_nb(q.start)})
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   183
        else:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   184
            new_node = SQ(**{q.fieldname+"__range":[self.__convert_nb(q.start),self.__convert_nb(q.end)]})
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   185
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   186
        current_node, current_connector = self.current_node_stack[-1]
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   187
        current_node.add(new_node, current_connector)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   188
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   189
    def __convert_nb(self, str_nb):        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   190
        try:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   191
            res = int(str_nb)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   192
            return res
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   193
        except ValueError:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   194
            try:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   195
                res = float(str_nb)
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   196
                return res
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   197
            except ValueError:
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   198
                return str_nb
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   199
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   200
        
4749704f9b40 use a custom query parser
ymh <ymh.work@gmail.com>
parents:
diff changeset
   201