diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java index e517d7e6..dfb02291 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java @@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets; public record SearchParameters(String query, SearchProfile profile, SearchJsParameter js) { public String profileStr() { - return profile.name; + return profile.filterId; } public SearchParameters withProfile(SearchProfile profile) { @@ -22,7 +22,7 @@ public record SearchParameters(String query, SearchProfile profile, SearchJsPara public String renderUrl(WebsiteUrl baseUrl) { String path = String.format("/search?query=%s&profile=%s&js=%s", URLEncoder.encode(query, StandardCharsets.UTF_8), - URLEncoder.encode(profile.name, StandardCharsets.UTF_8), + URLEncoder.encode(profile.filterId, StandardCharsets.UTF_8), URLEncoder.encode(js.value, StandardCharsets.UTF_8)); return baseUrl.withPath(path); diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java index fba9dbf3..880eb679 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java @@ -22,7 +22,7 @@ public class DecoratedSearchResults { return params.query(); } public String getProfile() { - return params.profile().name; + return params.profile().filterId; } public String getJs() { return params.js().value; diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java index 974a5ece..ab61ca11 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java @@ -27,11 +27,11 @@ public enum SearchProfile { ; - public final String name; + public final String filterId; public final SearchSetIdentifier searchSetIdentifier; - SearchProfile(String name, SearchSetIdentifier searchSetIdentifier) { - this.name = name; + SearchProfile(String filterId, SearchSetIdentifier searchSetIdentifier) { + this.filterId = filterId; this.searchSetIdentifier = searchSetIdentifier; } @@ -42,7 +42,7 @@ public enum SearchProfile { } for (var profile : values) { - if (Objects.equals(profile.name, param)) { + if (Objects.equals(profile.filterId, param)) { return profile; } }