|
@@ -972,6 +972,7 @@ public class FessEsClient implements Client {
|
|
private FacetInfo facetInfo;
|
|
private FacetInfo facetInfo;
|
|
private String similarDocHash;
|
|
private String similarDocHash;
|
|
private SearchRequestType searchRequestType = SearchRequestType.SEARCH;
|
|
private SearchRequestType searchRequestType = SearchRequestType.SEARCH;
|
|
|
|
+ private boolean isScroll = false;
|
|
|
|
|
|
public static SearchConditionBuilder builder(final SearchRequestBuilder searchRequestBuilder) {
|
|
public static SearchConditionBuilder builder(final SearchRequestBuilder searchRequestBuilder) {
|
|
return new SearchConditionBuilder(searchRequestBuilder);
|
|
return new SearchConditionBuilder(searchRequestBuilder);
|
|
@@ -1023,6 +1024,11 @@ public class FessEsClient implements Client {
|
|
return this;
|
|
return this;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public SearchConditionBuilder scroll() {
|
|
|
|
+ this.isScroll = true;
|
|
|
|
+ return this;
|
|
|
|
+ }
|
|
|
|
+
|
|
public boolean build() {
|
|
public boolean build() {
|
|
if (StringUtil.isBlank(query)) {
|
|
if (StringUtil.isBlank(query)) {
|
|
return false;
|
|
return false;
|
|
@@ -1109,7 +1115,8 @@ public class FessEsClient implements Client {
|
|
}));
|
|
}));
|
|
}
|
|
}
|
|
|
|
|
|
- if (!SearchRequestType.ADMIN_SEARCH.equals(searchRequestType) && fessConfig.isResultCollapsed() && similarDocHash == null) {
|
|
|
|
|
|
+ if (!SearchRequestType.ADMIN_SEARCH.equals(searchRequestType) && !isScroll && fessConfig.isResultCollapsed()
|
|
|
|
+ && similarDocHash == null) {
|
|
searchRequestBuilder.setCollapse(getCollapseBuilder(fessConfig));
|
|
searchRequestBuilder.setCollapse(getCollapseBuilder(fessConfig));
|
|
}
|
|
}
|
|
|
|
|