Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(search) Correct accidental regression of the Vintage filter

Browse Source
This commit is contained in:
Viktor Lofgren 2024-02-15 18:13:34 +01:00
parent 752e677555
commit 16526d283c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/services-application/search-service/src/main/java/nu/marginalia/search/SearchQueryParamFactory.java
View File

@ -21,6 +21,7 @@ public class SearchQueryParamFactory {
userParams.js().addTacitTerms(prototype); userParams.js().addTacitTerms(prototype);
userParams.adtech().addTacitTerms(prototype); userParams.adtech().addTacitTerms(prototype);
return new QueryParams( return new QueryParams(
userParams.query(), userParams.query(),
null, null,
@ -29,8 +30,8 @@ public class SearchQueryParamFactory {
prototype.searchTermsPriority, prototype.searchTermsPriority,
prototype.searchTermsAdvice, prototype.searchTermsAdvice,
profile.getQualityLimit(), profile.getQualityLimit(),
SpecificationLimit.none(), profile.getYearLimit(),
profile.getSizeLimit(), userParams.yearLimit(),
SpecificationLimit.none(), SpecificationLimit.none(),
SpecificationLimit.none(), SpecificationLimit.none(),
List.of(), List.of(),

8
code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java
View File

@ -3,6 +3,7 @@ package nu.marginalia.search.command;
import nu.marginalia.WebsiteUrl; import nu.marginalia.WebsiteUrl;
import nu.marginalia.index.client.model.results.ResultRankingParameters; import nu.marginalia.index.client.model.results.ResultRankingParameters;
import nu.marginalia.index.query.limit.QueryStrategy; import nu.marginalia.index.query.limit.QueryStrategy;
import nu.marginalia.index.query.limit.SpecificationLimit;
import nu.marginalia.search.model.SearchProfile; import nu.marginalia.search.model.SearchProfile;
import java.net.URLEncoder; import java.net.URLEncoder;
@ -71,4 +72,11 @@ public record SearchParameters(String query,
return QueryStrategy.AUTO; return QueryStrategy.AUTO;
} }
public SpecificationLimit yearLimit() {
if (recent == RECENT)
return SpecificationLimit.greaterThan(2018);
return profile.getYearLimit();
}
} }