From 6a20b2b678fc1a8319eaefeee769897f460f0a3c Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Fri, 17 Mar 2023 22:11:14 +0100 Subject: [PATCH] Trivial reformatting of code. --- .../nu/marginalia/index/svc/IndexQueryService.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexQueryService.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexQueryService.java index 2c0a23ff..8e3e5ae5 100644 --- a/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexQueryService.java +++ b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexQueryService.java @@ -103,6 +103,7 @@ public class IndexQueryService { } private SearchSet getSearchSet(SearchSpecification specsSet) { + if (specsSet.domains != null && !specsSet.domains.isEmpty()) { return new SmallSearchSet(specsSet.domains); } @@ -111,10 +112,9 @@ public class IndexQueryService { } private SearchResultSet executeSearch(SearchParameters params) { + var resultIds = evaluateSubqueries(params); - var resultItems = calculateResultScores(params, resultIds); - var bestResults = selectBestResults(params, resultItems); return new SearchResultSet(bestResults, createRankingContext(params.subqueries)); @@ -123,15 +123,12 @@ public class IndexQueryService { /* This information is routed back up the search service in order to calculate BM-25 * accurately */ private SearchResultRankingContext createRankingContext(List subqueries) { - final Map termToId = searchTermsSvc.getAllIncludeTerms(subqueries); - - int totalDocCount = index.getTotalDocCount(); - - final Map termFrequencies = new HashMap<>(termToId); + final var termToId = searchTermsSvc.getAllIncludeTerms(subqueries); + final var termFrequencies = new HashMap<>(termToId); termToId.forEach((key, id) -> termFrequencies.put(key, index.getTermFrequency(id))); - return new SearchResultRankingContext(totalDocCount, termFrequencies); + return new SearchResultRankingContext(index.getTotalDocCount(), termFrequencies); } private TLongList evaluateSubqueries(SearchParameters params) {