X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=f4754ef566b6e702884079c92c6f2a7fc55cd71c;hb=00d6cb2688d8dda20ce55d71825b4446701a3a7a;hp=3efba9542130bee114fb9dd96adcd0797fe4c247;hpb=f229fe41f708d2b275c20ceb9aba5993761218a3;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 3efba95..f4754ef 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
@@ -64,7 +65,7 @@ import com.google.common.collect.Ordering;
 public class SearchPage extends SoneTemplatePage {
 
 	/** The logger. */
-	private static final Logger logger = getLogger("Sone.Web.Search");
+	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>>>() {
@@ -101,8 +102,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 processSonePage(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		String query = request.getHttpRequest().getParam("query").trim();
 		if (query.length() == 0) {
 			throw new RedirectException("index.html");
@@ -356,7 +356,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) != null) ? albumId : null;
+		return webInterface.getCore().getAlbum(albumId).isPresent() ? albumId : null;
 	}
 
 	/**