src/ldt/ldt/indexation/query_parser.py
author ymh <ymh.work@gmail.com>
Tue, 22 Oct 2024 09:57:18 +0200
changeset 1516 9cfcfbac1a43
parent 1117 3bab1e42acfa
permissions -rw-r--r--
Added tag V01.65.08 for changeset c08d6aa5a51d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
725
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     1
# -*- coding: utf-8 -*-
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     2
'''
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     3
Created on Aug 1, 2012
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     4
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     5
@author: ymh
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     6
'''
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     7
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     8
#TODO: unitest for 
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
     9
1117
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
    10
from django.conf import settings
725
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    11
from haystack.query import SQ
1117
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
    12
from whoosh.qparser import (SimpleParser, FieldsPlugin, OperatorsPlugin, 
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
    13
    PhrasePlugin, SingleQuotePlugin, GroupPlugin, PrefixPlugin, GtLtPlugin, 
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
    14
    RangePlugin)
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
    15
from whoosh.query import (Term, And, AndMaybe, Or, AndNot, Not, Phrase, Prefix, 
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
    16
    TermRange)
725
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    17
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    18
HAYSTACK_DEFAULT_OPERATOR = getattr(settings,'HAYSTACK_DEFAULT_OPERATOR','AND')
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    19
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    20
class QueryParser(object):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    21
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    22
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    23
    def __init__(self, fieldname):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    24
        '''
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    25
        Constructor
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    26
        '''
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    27
        self.w_parser = SimpleParser(fieldname, None)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    28
        self.w_parser.add_plugin(FieldsPlugin())
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    29
        self.w_parser.add_plugin(OperatorsPlugin())
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    30
        self.w_parser.add_plugin(PhrasePlugin())
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    31
        self.w_parser.add_plugin(SingleQuotePlugin())
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    32
        self.w_parser.add_plugin(GroupPlugin())
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    33
        self.w_parser.add_plugin(PrefixPlugin())
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    34
        self.w_parser.add_plugin(GtLtPlugin())
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    35
        self.w_parser.add_plugin(RangePlugin())
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    36
        self.query = None
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    37
        self.current_node_stack = []        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    38
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    39
    def parse(self, query):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    40
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    41
        self.query = SQ()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    42
        self.current_node_stack = [(self.query, HAYSTACK_DEFAULT_OPERATOR)]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    43
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    44
        wquery = self.w_parser.parse(query)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    45
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    46
        self.visit(wquery)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    47
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    48
        if len(self.query) == 1 and isinstance(self.query.children[0], SQ):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    49
            return self.query.children[0]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    50
        else:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    51
            return self.query 
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    52
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    53
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    54
    def visit(self, q):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    55
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    56
        if isinstance(q, Term):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    57
            current_node, current_connector = self.current_node_stack.pop() 
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    58
            current_node.add(SQ(**{q.fieldname:q.text}), current_connector)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    59
            self.current_node_stack.append((current_node,current_connector))
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    60
        elif isinstance(q, And):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    61
            self._add_compound_query(q, SQ.AND)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    62
        elif isinstance(q, AndMaybe):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    63
            self._add_andmaybe(q)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    64
        elif isinstance(q, Or):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    65
            self._add_compound_query(q, SQ.OR)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    66
        elif isinstance(q, AndNot):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    67
            self._add_andnot(q)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    68
        elif isinstance(q, Not):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    69
            self._add_not(q)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    70
        elif isinstance(q, Phrase):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    71
            self._add_phrase(q)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    72
        elif isinstance(q, Prefix):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    73
            self._add_prefix(q)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    74
        elif isinstance(q, TermRange):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    75
            self._add_range(q)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    76
            
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    77
    def _add_compound_query(self, q, connector):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    78
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    79
        new_node = SQ()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    80
        self.current_node_stack.append((new_node, connector))
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    81
        for subquery in q.subqueries:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    82
            self.visit(subquery)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    83
        self.current_node_stack.pop()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    84
                        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    85
        if len(new_node)==1 and isinstance(new_node.children[0], SQ) :
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    86
            new_node = new_node.children[0]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    87
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    88
        current_node, current_connector = self.current_node_stack[-1]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    89
        current_node.add(new_node, current_connector)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    90
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    91
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    92
    def _add_andnot(self, q):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    93
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    94
        new_node = SQ()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    95
        self.current_node_stack.append((new_node, SQ.AND))
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    96
        self.visit(q.a)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    97
        self.visit(Not(q.b))
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    98
        self.current_node_stack.pop()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
    99
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   100
        if len(new_node)==1 and isinstance(new_node.children[0], SQ) :
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   101
            new_node = new_node.children[0]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   102
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   103
        current_node, current_connector = self.current_node_stack[-1]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   104
        current_node.add(new_node, current_connector)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   105
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   106
    def _add_andmaybe(self, q):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   107
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   108
        new_node = SQ()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   109
        self.current_node_stack.append((new_node, SQ.AND))
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   110
        self.visit(q.a)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   111
        self.visit(q.b)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   112
        self.current_node_stack.pop()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   113
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   114
        if len(new_node)==1 and isinstance(new_node.children[0], SQ) :
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   115
            new_node = new_node.children[0]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   116
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   117
        current_node, current_connector = self.current_node_stack[-1]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   118
        current_node.add(new_node, current_connector)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   119
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   120
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   121
    def _add_not(self, q):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   122
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   123
        new_node = SQ()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   124
        self.current_node_stack.append((new_node, SQ.AND))
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   125
        self.visit(q.query)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   126
        self.current_node_stack.pop()
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   127
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   128
        if len(new_node)==1 and isinstance(new_node.children[0], SQ) :
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   129
            new_node = new_node.children[0]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   130
            
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   131
        current_node, current_connector = self.current_node_stack[-1]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   132
        current_node.add(~new_node, current_connector)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   133
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   134
    def _add_phrase(self, q):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   135
        new_node = SQ(**{q.fieldname+"__exact":" ".join(q.words)})            
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   136
        current_node, current_connector = self.current_node_stack[-1]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   137
        current_node.add(new_node, current_connector)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   138
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   139
    def _add_prefix(self, q):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   140
        new_node = SQ(**{q.fieldname+"__startswith":q.text})            
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   141
        current_node, current_connector = self.current_node_stack[-1]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   142
        current_node.add(new_node, current_connector)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   143
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   144
    def _add_range(self, q):
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   145
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   146
        if q.start is None:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   147
            if q.endexcl:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   148
                postfix = "__lt"
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   149
            else:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   150
                postfix = "__lte"
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   151
            new_node = SQ(**{q.fieldname+postfix:self.__convert_nb(q.end)})
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   152
        elif q.end is None:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   153
            if q.startexcl:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   154
                postfix = "__gt"
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   155
            else:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   156
                postfix = "__gte"
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   157
            new_node = SQ(**{q.fieldname+postfix:self.__convert_nb(q.start)})
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   158
        else:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   159
            new_node = SQ(**{q.fieldname+"__range":[self.__convert_nb(q.start),self.__convert_nb(q.end)]})
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   160
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   161
        current_node, current_connector = self.current_node_stack[-1]
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   162
        current_node.add(new_node, current_connector)
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   163
1117
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
   164
    def __convert_nb(self, str_nb):        
725
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   165
        try:
1117
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
   166
            res = int(str_nb)
725
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   167
            return res
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   168
        except ValueError:
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   169
            try:
1117
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
   170
                res = float(str_nb)
725
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   171
                return res
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   172
            except ValueError:
1117
3bab1e42acfa - update haystack
ymh <ymh.work@gmail.com>
parents: 725
diff changeset
   173
                return str_nb
725
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   174
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   175
        
4f4005df9a97 improve indexation query language
ymh <ymh.work@gmail.com>
parents:
diff changeset
   176