From c67a63510382c8b6291d2348357e93dd0c239f35 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Fri, 10 Jan 2025 15:44:44 +0100 Subject: [PATCH] (search, experimental) Add a few debugging tracks to the search UI --- .../java/nu/marginalia/search/SearchOperator.java | 6 ++++++ .../marginalia/search/command/commands/SearchCommand.java | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/services-application/search-service/java/nu/marginalia/search/SearchOperator.java b/code/services-application/search-service/java/nu/marginalia/search/SearchOperator.java index baf693ed..dec6fd19 100644 --- a/code/services-application/search-service/java/nu/marginalia/search/SearchOperator.java +++ b/code/services-application/search-service/java/nu/marginalia/search/SearchOperator.java @@ -320,6 +320,8 @@ public class SearchOperator { // Return the results to the user return DecoratedSearchResults.builder() .params(userParams) + .problems(List.of()) + .evalResult("") .results(clusteredResults) .filters(new SearchFilters(userParams)) .focusDomain(focusDomain) @@ -353,6 +355,8 @@ public class SearchOperator { // Return the results to the user return DecoratedSearchResults.builder() .params(userParams) + .problems(List.of()) + .evalResult("") .results(clusteredResults) .filters(new SearchFilters(userParams)) .focusDomain(focusDomain) @@ -382,6 +386,8 @@ public class SearchOperator { // Return the results to the user return DecoratedSearchResults.builder() .params(userParams) + .problems(List.of()) + .evalResult("") .results(clusteredResults) .filters(new SearchFilters(userParams)) .focusDomain(null) diff --git a/code/services-application/search-service/java/nu/marginalia/search/command/commands/SearchCommand.java b/code/services-application/search-service/java/nu/marginalia/search/command/commands/SearchCommand.java index 21c4834c..2e824e86 100644 --- a/code/services-application/search-service/java/nu/marginalia/search/command/commands/SearchCommand.java +++ b/code/services-application/search-service/java/nu/marginalia/search/command/commands/SearchCommand.java @@ -32,19 +32,19 @@ public class SearchCommand implements SearchCommandInterface { else if (parameters.debug() == 1) { DecoratedSearchResults results = searchOperator.doSearchFastTrack1(parameters); return Optional.of(new MapModelAndView("serp/main.jte", - Map.of("parameters", results, "navbar", NavbarModel.SEARCH) + Map.of("results", results, "navbar", NavbarModel.SEARCH) )); } else if (parameters.debug() == 2) { DecoratedSearchResults results = searchOperator.doSearchFastTrack2(parameters); return Optional.of(new MapModelAndView("serp/main.jte", - Map.of("parameters", results, "navbar", NavbarModel.SEARCH) + Map.of("results", results, "navbar", NavbarModel.SEARCH) )); } else if (parameters.debug() == 3) { DecoratedSearchResults results = searchOperator.doSearchFastTrack3(parameters); return Optional.of(new MapModelAndView("serp/main.jte", - Map.of("parameters", results, "navbar", NavbarModel.SEARCH) + Map.of("results", results, "navbar", NavbarModel.SEARCH) )); } else {