From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 12 Jul 2011 04:29:19 +0000 (+0200)
Subject: Handle single plus and minus signs better.
X-Git-Tag: 0.6.6^2~20
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=52736da6e2a761ec0efdeb19497501e49a28af25

Handle single plus and minus signs better.

This resolves #206.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index d50a254..2a1c1b0 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -175,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;
 	}