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=903975dbd075996be17221c17e4732f571cf8d94;hpb=8759d9a5f7e33303810ba50ad97746983d5b7d38;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 903975d..2a1c1b0 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - OptionsPage.java - Copyright © 2010 David Roden
+ * Sone - SearchPage.java - Copyright © 2010 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,14 +24,16 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import net.pterodactylus.sone.data.Post;
 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;
@@ -50,6 +52,9 @@ import net.pterodactylus.util.text.TextException;
  */
 public class SearchPage extends SoneTemplatePage {
 
+	/** The logger. */
+	private static final Logger logger = Logging.getLogger(SearchPage.class);
+
 	/**
 	 * Creates a new search page.
 	 *
@@ -78,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);
@@ -100,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));
@@ -167,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;
 	}
@@ -187,6 +204,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 “%s”…", expression);
 		double optionalHits = 0;
 		double requiredHits = 0;
 		int forbiddenHits = 0;
@@ -206,8 +224,10 @@ public class SearchPage extends SoneTemplatePage {
 				}
 				score += Math.pow(1 - position / (double) expression.length(), 2);
 				index = position + phraseString.length();
+				logger.log(Level.FINEST, "Got hit at position %d.", position);
 				++matches;
 			}
+			logger.log(Level.FINEST, "Score: %f", score);
 			if (matches == 0) {
 				continue;
 			}
@@ -472,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();
 		}