Merge pull request #127 from MJedr/tex-key

visitor: add texkey search
inspirehep · Apr 27, 2020 · 34347ad · 34347ad
2 parents bf93079 + ce127f6
commit 34347ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 31 deletions.
diff --git a/inspire_query_parser/visitors/elastic_search_visitor.py b/inspire_query_parser/visitors/elastic_search_visitor.py
@@ -840,12 +840,11 @@ def visit_value(self, node, fieldnames=None):
             elif fieldnames not in self.KEYWORD_TO_ES_FIELDNAME.values():
                 colon_value = ':'.join([fieldnames, node.value])
                 given_field_query = generate_match_query(fieldnames, node.value, with_operator_and=True)
-                texkey_query = ''
                 if self.TEXKEY_REGEX.match(colon_value):
-                    texkey_query = self._generate_term_query('texkeys.raw', colon_value, boost=2.0)
+                    return generate_match_query('texkeys.raw', colon_value, with_operator_and=False)
                 _all_field_query = generate_match_query('_all', colon_value, with_operator_and=True)
                 query = wrap_queries_in_bool_clauses_if_more_than_one(
-                    [given_field_query, texkey_query, _all_field_query], use_must_clause=False)
+                    [given_field_query, _all_field_query], use_must_clause=False)
                 return wrap_query_in_nested_if_field_is_nested(query, fieldnames, self.NESTED_FIELDS)
 
             return generate_match_query(fieldnames, node.value, with_operator_and=True)

diff --git a/tests/test_elastic_search_visitor.py b/tests/test_elastic_search_visitor.py
@@ -531,34 +531,9 @@ def test_elastic_search_visitor_unknown_keyword_simple_value():
 def test_elastic_search_visitor_unknown_keyword_simple_value_maybe_texkey():
     query_str = 'smith:2009xj'
     expected_es_query = {
-        "bool": {
-            "should": [
-                {
-                    "match": {
-                        "smith": {
-                            "query": "2009xj",
-                            "operator": "and",
-                        }
-                    }
-                },
-                {
-                    "term": {
-                        "texkeys.raw": {
-                            "value": "smith:2009xj",
-                            "boost": 2.0,
-                        }
-                    }
-                },
-                {
-                    "match": {
-                        "_all": {
-                            "query": "smith:2009xj",
-                            "operator": "and",
-                        }
-                    }
-                }
-            ]
-        }
+       "match":{
+          "texkeys.raw":"smith:2009xj"
+       }
     }
 
     generated_es_query = _parse_query(query_str)