X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=2a1c1b01f9196d1a79a3f8ebf15cba4489b324ca;hb=52736da6e2a761ec0efdeb19497501e49a28af25;hp=74bfd10db237d5ea06ee753f0aa390ef7608d3b2;hpb=c5e641893a2656ebf2c2c8c369fe75eaf3061b52;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 74bfd10..2a1c1b0 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));
@@ -172,11 +175,20 @@ public class SearchPage extends SoneTemplatePage {
 		List<Phrase> phrases = new ArrayList<Phrase>();
 		for (String phrase : parsedPhrases) {
 			if (phrase.startsWith("+")) {
-				phrases.add(new Phrase(phrase.substring(1), Phrase.Optionality.REQUIRED));
+				if (phrase.length() > 1) {
+					phrases.add(new Phrase(phrase.substring(1), Phrase.Optionality.REQUIRED));
+				} else {
+					phrases.add(new Phrase("+", Phrase.Optionality.OPTIONAL));
+				}
 			} else if (phrase.startsWith("-")) {
-				phrases.add(new Phrase(phrase.substring(1), Phrase.Optionality.FORBIDDEN));
+				if (phrase.length() > 1) {
+					phrases.add(new Phrase(phrase.substring(1), Phrase.Optionality.FORBIDDEN));
+				} else {
+					phrases.add(new Phrase("-", Phrase.Optionality.OPTIONAL));
+				}
+			} else {
+				phrases.add(new Phrase(phrase, Phrase.Optionality.OPTIONAL));
 			}
-			phrases.add(new Phrase(phrase, Phrase.Optionality.OPTIONAL));
 		}
 		return phrases;
 	}
@@ -480,13 +492,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();
 		}