161sh/CatgirlIntelligenceAgency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(search) Add query strategy requiring link

Browse Source
This commit is contained in:
Viktor Lofgren 2024-01-03 16:23:00 +01:00
parent 0e970b8037
commit 5c2561d05d
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/features-index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryStrategy.java
View File

@ -9,6 +9,7 @@ public enum QueryStrategy {
REQUIRE_FIELD_SUBJECT, REQUIRE_FIELD_SUBJECT,
REQUIRE_FIELD_URL, REQUIRE_FIELD_URL,
REQUIRE_FIELD_DOMAIN, REQUIRE_FIELD_DOMAIN,
REQUIRE_FIELD_LINK,
AUTO AUTO
} }

4
code/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultValuator.java
View File

@ -172,7 +172,9 @@ public class IndexResultValuator {
else if (queryStrategy == QueryStrategy.REQUIRE_FIELD_DOMAIN) { else if (queryStrategy == QueryStrategy.REQUIRE_FIELD_DOMAIN) {
return WordMetadata.hasFlags(termScore.encodedWordMetadata(), WordFlags.UrlDomain.asBit()); return WordMetadata.hasFlags(termScore.encodedWordMetadata(), WordFlags.UrlDomain.asBit());
} }
else if (queryStrategy == QueryStrategy.REQUIRE_FIELD_LINK) {
return WordMetadata.hasFlags(termScore.encodedWordMetadata(), WordFlags.ExternalLink.asBit());
}
return true; return true;
} }

1
code/services-core/query-service/src/main/java/nu/marginalia/query/svc/QueryLimitsAccumulator.java
View File

@ -45,6 +45,7 @@ public class QueryLimitsAccumulator implements TokenVisitor {
case "RF_SITE" -> QueryStrategy.REQUIRE_FIELD_SITE; case "RF_SITE" -> QueryStrategy.REQUIRE_FIELD_SITE;
case "RF_URL" -> QueryStrategy.REQUIRE_FIELD_URL; case "RF_URL" -> QueryStrategy.REQUIRE_FIELD_URL;
case "RF_DOMAIN" -> QueryStrategy.REQUIRE_FIELD_DOMAIN; case "RF_DOMAIN" -> QueryStrategy.REQUIRE_FIELD_DOMAIN;
case "RF_LINK" -> QueryStrategy.REQUIRE_FIELD_LINK;
case "SENTENCE" -> QueryStrategy.SENTENCE; case "SENTENCE" -> QueryStrategy.SENTENCE;
case "TOPIC" -> QueryStrategy.TOPIC; case "TOPIC" -> QueryStrategy.TOPIC;
default -> QueryStrategy.AUTO; default -> QueryStrategy.AUTO;