X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=73673abed1e6ba0ce2579ff32c1091511b5f7af3;hb=9ee1da2306234248b6077946fc254d8436fb4bd1;hp=b10162e0f446ba8571d77d835a36eca75097a149;hpb=445675e50d824e5899007fe7afccd769dfcf0d10;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 b10162e..73673ab 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -110,6 +110,17 @@ public class SearchPage extends SoneTemplatePage {
 		templateContext.set("soneHits", sonePagination.getItems());
 		templateContext.set("postPagination", postPagination);
 		templateContext.set("postHits", postPagination.getItems());
+
+		/* mark found posts and Sones as knew. */
+		for (Sone sone : sonePagination.getItems()) {
+			webInterface.getCore().markSoneKnown(sone);
+		}
+		for (Post post : postPagination.getItems()) {
+			webInterface.getCore().markPostKnown(post);
+			for (Reply reply : webInterface.getCore().getReplies(post)) {
+				webInterface.getCore().markReplyKnown(reply);
+			}
+		}
 	}
 
 	//
@@ -191,21 +202,31 @@ public class SearchPage extends SoneTemplatePage {
 		int forbiddenHits = 0;
 		int requiredPhrases = 0;
 		for (Phrase phrase : phrases) {
+			String phraseString = phrase.getPhrase().toLowerCase();
 			if (phrase.getOptionality() == Phrase.Optionality.REQUIRED) {
 				++requiredPhrases;
 			}
-			boolean matches = expression.toLowerCase().contains(phrase.getPhrase().toLowerCase());
-			if (!matches) {
+			int matches = 0;
+			int index = 0;
+			while (index < expression.length()) {
+				int position = expression.toLowerCase().indexOf(phraseString, index);
+				if (position == -1) {
+					break;
+				}
+				index = position + phraseString.length();
+				++matches;
+			}
+			if (matches == 0) {
 				continue;
 			}
 			if (phrase.getOptionality() == Phrase.Optionality.REQUIRED) {
-				++requiredHits;
+				requiredHits += matches;
 			}
 			if (phrase.getOptionality() == Phrase.Optionality.OPTIONAL) {
-				++optionalHits;
+				optionalHits += matches;
 			}
 			if (phrase.getOptionality() == Phrase.Optionality.FORBIDDEN) {
-				++forbiddenHits;
+				forbiddenHits += matches;
 			}
 		}
 		return requiredHits * 3 + optionalHits + (requiredHits - requiredPhrases) * 5 - (forbiddenHits * 2);