Merge 0db5d99 into f3c5ade

inspirehep · Jan 6, 2020 · 82be670 · 82be670
2 parents f3c5ade + 0db5d99
commit 82be670
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/inspire_query_parser/visitors/elastic_search_visitor.py b/inspire_query_parser/visitors/elastic_search_visitor.py
@@ -664,10 +664,15 @@ def visit_nested_keyword_op(self, node):  # TODO Cannot be completed as of yet.
                     'successor',
                     with_operator_and=False
                 )
+                self_citation = generate_match_query(
+                    "control_number",
+                    recid,
+                    with_operator_and=False
+                )
                 return {
                     'bool': {
                         'must': [citing_records_query, records_with_collection_literature_query],
-                        'must_not': [superseded_records_query]
+                        'must_not': [superseded_records_query, self_citation]
                     }
                 }
 

diff --git a/tests/test_elastic_search_visitor.py b/tests/test_elastic_search_visitor.py
@@ -2305,6 +2305,11 @@ def test_nested_refersto_recid_nested_keyword_query():
                         'match': {
                             'related_records.relation': 'successor'
                         }
+                    },
+                    {
+                        'match': {
+                            'control_number': '123456'
+                        }
                     }
                 ]
             }