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

(search) Fix issue where searchTitle setting gets lost when searching again

Browse Source 
It's important that the field names in SearchParameters matches the fields referenced in search-form.hdb, otherwise they will get lost in transit.
This commit is contained in:
Viktor Lofgren 2024-02-15 13:52:11 +01:00
parent 66b3e71e56
commit 2515993536
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ public record SearchParameters(String query,
SearchProfile profile, SearchProfile profile,
SearchJsParameter js, SearchJsParameter js,
SearchRecentParameter recent, SearchRecentParameter recent,
SearchTitleParameter title, SearchTitleParameter searchTitle,
SearchAdtechParameter adtech SearchAdtechParameter adtech
) { ) {
public String profileStr() { public String profileStr() {
@ -22,18 +22,18 @@ public record SearchParameters(String query,
} }
public SearchParameters withProfile(SearchProfile profile) { public SearchParameters withProfile(SearchProfile profile) {
return new SearchParameters(query, profile, js, recent, title, adtech); return new SearchParameters(query, profile, js, recent, searchTitle, adtech);
} }
public SearchParameters withJs(SearchJsParameter js) { public SearchParameters withJs(SearchJsParameter js) {
return new SearchParameters(query, profile, js, recent, title, adtech); return new SearchParameters(query, profile, js, recent, searchTitle, adtech);
} }
public SearchParameters withAdtech(SearchAdtechParameter adtech) { public SearchParameters withAdtech(SearchAdtechParameter adtech) {
return new SearchParameters(query, profile, js, recent, title, adtech); return new SearchParameters(query, profile, js, recent, searchTitle, adtech);
} }
public SearchParameters withRecent(SearchRecentParameter recent) { public SearchParameters withRecent(SearchRecentParameter recent) {
return new SearchParameters(query, profile, js, recent, title, adtech); return new SearchParameters(query, profile, js, recent, searchTitle, adtech);
} }
public SearchParameters withTitle(SearchTitleParameter title) { public SearchParameters withTitle(SearchTitleParameter title) {
@ -47,7 +47,7 @@ public record SearchParameters(String query,
URLEncoder.encode(js.value, StandardCharsets.UTF_8), URLEncoder.encode(js.value, StandardCharsets.UTF_8),
URLEncoder.encode(adtech.value, StandardCharsets.UTF_8), URLEncoder.encode(adtech.value, StandardCharsets.UTF_8),
URLEncoder.encode(recent.value, StandardCharsets.UTF_8), URLEncoder.encode(recent.value, StandardCharsets.UTF_8),
URLEncoder.encode(title.value, StandardCharsets.UTF_8) URLEncoder.encode(searchTitle.value, StandardCharsets.UTF_8)
); );
return baseUrl.withPath(path); return baseUrl.withPath(path);
@ -65,7 +65,7 @@ public record SearchParameters(String query,
} }
public QueryStrategy strategy() { public QueryStrategy strategy() {
if (title == SearchTitleParameter.TITLE) { if (searchTitle == SearchTitleParameter.TITLE) {
return QueryStrategy.REQUIRE_FIELD_TITLE; return QueryStrategy.REQUIRE_FIELD_TITLE;
} }