ModuleSearcher: Fix search for incoherent words

frauzufall · frauzufall · commit fd6afdc0c4ce · 2019-05-15T15:39:01.000+02:00
* searches for all parts of a the search term divided by space
individually
diff --git a/src/main/java/org/scijava/search/module/ModuleSearcher.java b/src/main/java/org/scijava/search/module/ModuleSearcher.java
@@ -29,6 +29,7 @@
 
 package org.scijava.search.module;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -80,22 +81,33 @@ public List<SearchResult> search(final String text, final boolean fuzzy) {
 			.collect(Collectors.toList());
 
 		final String textLower = text.toLowerCase();
+		final List<String> textLowerParts = Arrays.asList(textLower.split("\\s+"));
 
-		// First, add modules where title starts with the text.
+		// Add modules where title starts with the text.
 		modules.stream() //
 			.filter(info -> startsWith(info, textLower) ) //
 			.forEach(matches::add);
 
-		// Next, add modules where title has text inside somewhere.
+		// Add modules where title has text inside somewhere.
 		modules.stream() //
 			.filter(info -> hasSubstringInTitle(info, textLower)) //
 			.forEach(matches::add);
 
-		// Finally, add modules where menu path has text inside somewhere.
+		// Add modules where menu path has text inside somewhere.
 		modules.stream() //
 			.filter(info -> hasSubstringInMenu(info, textLower)) //
 			.forEach(matches::add);
 
+		// Add modules where title has all parts of the text inside somewhere.
+		modules.stream() //
+				.filter(info -> hasSubstringsInTitle(info, textLowerParts)) //
+				.forEach(matches::add);
+
+		// Add modules where menu path has all parts of the text inside somewhere.
+		modules.stream() //
+				.filter(info -> hasSubstringsInMenu(info, textLowerParts)) //
+				.forEach(matches::add);
+
 		// Wrap each matching ModuleInfo in a ModuleSearchResult.
 		return matches.stream() //
 			.map(info -> new ModuleSearchResult(info, baseDir)) //
@@ -168,11 +180,27 @@ private boolean hasSubstringInTitle(final ModuleInfo info,
 			title.toLowerCase().matches(".*" + desiredLower + ".*");
 	}
 
+	private boolean hasSubstringsInTitle(final ModuleInfo info,
+	                                    final List<String> desiredLower)
+	{
+		final String title = title(info);
+		if(title == null) return false;
+		return desiredLower.stream().allMatch(part -> title.toLowerCase().contains(part));
+	}
+
 	private boolean hasSubstringInMenu(final ModuleInfo info,
 	                                    final String desiredLower)
 	{
 		MenuPath menuPath = info.getMenuPath();
 		if(menuPath == null) return false;
 		return menuPath.stream().anyMatch(entry -> entry.getName().toLowerCase().contains(desiredLower));
 	}
+
+	private boolean hasSubstringsInMenu(final ModuleInfo info,
+	                                    final List<String> desiredLower)
+	{
+		MenuPath menuPath = info.getMenuPath();
+		if(menuPath == null) return false;
+		return desiredLower.stream().allMatch(part -> menuPath.stream().anyMatch(entry -> entry.getName().toLowerCase().contains(part)));
+	}
 }
diff --git a/src/test/java/org/scijava/search/module/ModuleSearcherTest.java b/src/test/java/org/scijava/search/module/ModuleSearcherTest.java
@@ -15,6 +15,7 @@
 
 import java.util.List;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -77,6 +78,23 @@ public void testMenu() {
 		assertTrue(containsModule(results, "nolabel"));
 	}
 
+	@Test
+	public void testMatchingPartsInMenu() {
+		createTestModule("nolabel", "Do>something>silly");
+		List<SearchResult> results = moduleSearcher.search("Do silly", true);
+		assertNotNull(results);
+		assertTrue(results.size()>=1);
+		assertTrue(containsModule(results, "nolabel"));
+	}
+
+	@Test
+	public void testNonMatchingPartsInMenu() {
+		createTestModule("nolabel", "Do>something>silly");
+		List<SearchResult> results = moduleSearcher.search("Do nothing", true);
+		assertNotNull(results);
+		assertFalse(containsModule(results, "nolabel"));
+	}
+
 	private boolean containsModule(List<SearchResult> results, String moduleName) {
 		boolean foundModule = false;
 		for(SearchResult result : results) {
