diff --git a/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java b/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java index 2b2abd3aa..a45d55d92 100644 --- a/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java +++ b/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java @@ -102,7 +102,6 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { final SearchRenderData data = new SearchRenderData(); final GsaRequestParams params = new GsaRequestParams(request, fessConfig); query = params.getQuery(); - request.setAttribute(Constants.REQUEST_QUERIES, query); searchService.search(params, data, OptionalThing.empty()); final String execTime = data.getExecTime(); final long allRecordCount = data.getAllRecordCount(); diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java index e29e2f17f..2f17fa032 100644 --- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java @@ -138,7 +138,6 @@ public class JsonApiManager extends BaseJsonApiManager { final SearchRenderData data = new SearchRenderData(); final JsonRequestParams params = new JsonRequestParams(request, fessConfig); query = params.getQuery(); - request.setAttribute(Constants.REQUEST_QUERIES, query); searchService.search(params, data, OptionalThing.empty()); final String execTime = data.getExecTime(); final String queryTime = Long.toString(data.getQueryTime()); diff --git a/src/main/java/org/codelibs/fess/app/service/SearchService.java b/src/main/java/org/codelibs/fess/app/service/SearchService.java index 94195d748..415fdbbdc 100644 --- a/src/main/java/org/codelibs/fess/app/service/SearchService.java +++ b/src/main/java/org/codelibs/fess/app/service/SearchService.java @@ -56,6 +56,7 @@ import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.lastaflute.taglib.function.LaFunctions; +import org.lastaflute.web.util.LaRequestUtil; public class SearchService { @@ -85,9 +86,13 @@ public class SearchService { public void search(final SearchRequestParams params, final SearchRenderData data, final OptionalThing userBean) { final long requestedTime = systemHelper.getCurrentTimeAsLong(); - final long startTime = System.currentTimeMillis(); + LaRequestUtil.getOptionalRequest().ifPresent(request -> { + request.setAttribute(Constants.REQUEST_LANGUAGES, params.getLanguages()); + request.setAttribute(Constants.REQUEST_QUERIES, params.getQuery()); + }); + final String query = QueryStringBuilder.query(params.getQuery()).extraQueries(params.getExtraQueries()).fields(params.getFields()).build(); diff --git a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java index 130ce4a3f..65979a75c 100644 --- a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java @@ -130,8 +130,6 @@ public class SearchAction extends FessSearchAction { try { buildFormParams(form); form.lang = searchService.getLanguages(request, form); - request.setAttribute(Constants.REQUEST_LANGUAGES, form.lang); - request.setAttribute(Constants.REQUEST_QUERIES, form.q); final WebRenderData renderData = new WebRenderData(); searchService.search(form, renderData, getUserBean()); return asHtml(virtualHost(path_SearchJsp)).renderWith(