Merge pull request #118 from drjova/fix-two-initials

authors: fix case for two initials without space
inspirehep · Mar 20, 2020 · 569d3ae · 569d3ae
2 parents 483b0ea + 2fb01d5
commit 569d3ae
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/inspire_query_parser/utils/visitor_utils.py b/inspire_query_parser/utils/visitor_utils.py
@@ -61,7 +61,7 @@ def retokenize_first_names(names):
             names_filtered.extend(name.split('.'))
         else:
             names_filtered.append(name)
-    return names_filtered
+    return filter(None, names_filtered)
 
 
 def is_initial_of_a_name(name_part):

diff --git a/tests/test_elastic_search_visitor.py b/tests/test_elastic_search_visitor.py
@@ -1672,6 +1672,52 @@ def test_hack_to_split_initial_and_firstname_without_a_space():
     assert ordered(generated_es_query) == ordered(expected_query)
 
 
+def test_hack_to_split_two_initials_without_a_space():
+    query_str = "a D.K. Smith"
+    expected_query = {
+        "nested": {
+            "path": "authors",
+            "query": {
+                "bool": {
+                    "must": [
+                        {
+                            "match": {
+                                "authors.last_name": {
+                                    "operator": "AND",
+                                    "query": "Smith",
+                                }
+                            }
+                        },
+                        {
+                            "bool": {
+                                "must": [
+                                    {
+                                        "match": {
+                                            "authors.first_name.initials": {
+                                                "query": "D",
+                                            }
+                                        }
+                                    },
+                                    {
+                                        "match": {
+                                            "authors.first_name.initials": {
+                                                "query": "K",
+                                            }
+                                        }
+                                    }
+                                ]
+                            }
+                        },
+                    ]
+                }
+            },
+        }
+    }
+
+    generated_es_query = _parse_query(query_str)
+    assert ordered(generated_es_query) == ordered(expected_query)
+
+
 def test_elastic_search_visitor_author_lastname_initial():
     query_str = "a ellis, j"
     expected_query = {