X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=d50a254d5d396ac7967d872bc7ccbc6146ba5574;hb=084e8ed97fd315caadb5051e21ed50c29be9de0e;hp=94b296c8c38f3e1a7d3fd5d070ad6bfe689bc14b;hpb=d0ae5f106a59d7ac808e03287af2e5a33e50ba8b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index 94b296c..d50a254 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -32,8 +32,8 @@ import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.util.collection.Converter;
-import net.pterodactylus.util.collection.Converters;
+import net.pterodactylus.util.collection.Mapper;
+import net.pterodactylus.util.collection.Mappers;
 import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.filter.Filter;
 import net.pterodactylus.util.filter.Filters;
@@ -83,6 +83,9 @@ public class SearchPage extends SoneTemplatePage {
 		}
 
 		List<Phrase> phrases = parseSearchPhrases(query);
+		if (phrases.isEmpty()) {
+			throw new RedirectException("index.html");
+		}
 
 		Set<Sone> sones = webInterface.getCore().getSones();
 		Set<Hit<Sone>> soneHits = getHits(sones, phrases, SoneStringGenerator.COMPLETE_GENERATOR);
@@ -105,8 +108,8 @@ public class SearchPage extends SoneTemplatePage {
 		Collections.sort(sortedPostHits, Hit.DESCENDING_COMPARATOR);
 
 		/* extract Sones and posts. */
-		List<Sone> resultSones = Converters.convertList(sortedSoneHits, new HitConverter<Sone>());
-		List<Post> resultPosts = Converters.convertList(sortedPostHits, new HitConverter<Post>());
+		List<Sone> resultSones = Mappers.mappedList(sortedSoneHits, new HitMapper<Sone>());
+		List<Post> resultPosts = Mappers.mappedList(sortedPostHits, new HitMapper<Post>());
 
 		/* pagination. */
 		Pagination<Sone> sonePagination = new Pagination<Sone>(resultSones, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("sonePage"), 0));
@@ -192,7 +195,7 @@ public class SearchPage extends SoneTemplatePage {
 	 * @return The score of the expression
 	 */
 	private double calculateScore(List<Phrase> phrases, String expression) {
-		logger.log(Level.FINEST, "Calculating Score for “" + expression + "”…");
+		logger.log(Level.FINEST, "Calculating Score for “%s”…", expression);
 		double optionalHits = 0;
 		double requiredHits = 0;
 		int forbiddenHits = 0;
@@ -480,13 +483,13 @@ public class SearchPage extends SoneTemplatePage {
 	 *            The type of the object to extract
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
-	public static class HitConverter<T> implements Converter<Hit<T>, T> {
+	public static class HitMapper<T> implements Mapper<Hit<T>, T> {
 
 		/**
 		 * {@inheritDoc}
 		 */
 		@Override
-		public T convert(Hit<T> input) {
+		public T map(Hit<T> input) {
 			return input.getObject();
 		}