X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=8b444a7cbd3ff5e52478403fcf6f57ff7d1b3ff9;hp=6c9e15c3e1ee8766a45635f129a259e6f0f41226;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e

diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index 6c9e15c..8b444a7 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 - SearchPage.java - Copyright © 2010–2013 David Roden
+ * Sone - SearchPage.java - Copyright © 2010–2016 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
@@ -17,6 +17,10 @@
 
 package net.pterodactylus.sone.web;
 
+import static com.google.common.base.Optional.fromNullable;
+import static com.google.common.primitives.Ints.tryParse;
+import static java.util.logging.Logger.getLogger;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -36,8 +40,6 @@ import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.collection.Pagination;
-import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.text.StringEscaper;
@@ -62,7 +64,7 @@ import com.google.common.collect.Ordering;
 public class SearchPage extends SoneTemplatePage {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(SearchPage.class);
+	private static final Logger logger = getLogger(SearchPage.class.getName());
 
 	/** Short-term cache. */
 	private final LoadingCache<List<Phrase>, Set<Hit<Post>>> hitCache = CacheBuilder.newBuilder().expireAfterWrite(5, TimeUnit.MINUTES).build(new CacheLoader<List<Phrase>, Set<Hit<Post>>>() {
@@ -99,8 +101,7 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	@Override
 	@SuppressWarnings("synthetic-access")
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		String query = request.getHttpRequest().getParam("query").trim();
 		if (query.length() == 0) {
 			throw new RedirectException("index.html");
@@ -149,8 +150,8 @@ public class SearchPage extends SoneTemplatePage {
 		List<Post> resultPosts = FluentIterable.from(sortedPostHits).transform(new HitMapper<Post>()).toList();
 
 		/* pagination. */
-		Pagination<Sone> sonePagination = new Pagination<Sone>(resultSones, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("sonePage"), 0));
-		Pagination<Post> postPagination = new Pagination<Post>(resultPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("postPage"), 0));
+		Pagination<Sone> sonePagination = new Pagination<Sone>(resultSones, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(fromNullable(tryParse(request.getHttpRequest().getParam("sonePage"))).or(0));
+		Pagination<Post> postPagination = new Pagination<Post>(resultPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(fromNullable(tryParse(request.getHttpRequest().getParam("postPage"))).or(0));
 
 		templateContext.set("sonePagination", sonePagination);
 		templateContext.set("soneHits", sonePagination.getItems());
@@ -201,7 +202,7 @@ public class SearchPage extends SoneTemplatePage {
 	 * @return The parsed phrases
 	 */
 	private static List<Phrase> parseSearchPhrases(String query) {
-		List<String> parsedPhrases = null;
+		List<String> parsedPhrases;
 		try {
 			parsedPhrases = StringEscaper.parseLine(query);
 		} catch (TextException te1) {
@@ -354,7 +355,7 @@ public class SearchPage extends SoneTemplatePage {
 	 */
 	private String getAlbumId(String phrase) {
 		String albumId = phrase.startsWith("album://") ? phrase.substring(8) : phrase;
-		return (webInterface.getCore().getAlbum(albumId, false) != null) ? albumId : null;
+		return (webInterface.getCore().getAlbum(albumId) != null) ? albumId : null;
 	}
 
 	/**
@@ -581,7 +582,7 @@ public class SearchPage extends SoneTemplatePage {
 
 			@Override
 			public boolean apply(Hit<?> hit) {
-				return hit.getScore() > 0;
+				return (hit != null) && (hit.getScore() > 0);
 			}
 
 		};
@@ -591,7 +592,7 @@ public class SearchPage extends SoneTemplatePage {
 
 			@Override
 			public int compare(Hit<?> leftHit, Hit<?> rightHit) {
-				return (rightHit.getScore() < leftHit.getScore()) ? -1 : ((rightHit.getScore() > leftHit.getScore()) ? 1 : 0);
+				return Double.compare(rightHit.getScore(), leftHit.getScore());
 			}
 
 		};