0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1408 replace with _local

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-12-31 22:43:04 +09:00
parent 7ea482b255
commit 7e828b7d2b
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/Constants.java
View file

@ -397,7 +397,7 @@ public class Constants extends CoreLibConstants {
public static final String REQUEST_LANGUAGES = "requestLanguages";
public static final String SEARCH_PREFERENCE_PRIMARY = "_primary";
public static final String SEARCH_PREFERENCE_LOCAL = "_local";
public static final String CONFIG_CLEANUP_FILTERS = "cleanup.urlFilters";

2
src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
View file

@ -134,7 +134,7 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
}
builder.setQuery(QueryBuilders.wrapperQuery(paramMap.containsKey(QUERY) ? paramMap.get(QUERY).trim() : "{\"match_all\":{}}"));
builder.setScroll(scroll);
builder.setPreference(paramMap.containsKey(PREFERENCE) ? paramMap.get(PREFERENCE).trim() : Constants.SEARCH_PREFERENCE_PRIMARY);
builder.setPreference(paramMap.containsKey(PREFERENCE) ? paramMap.get(PREFERENCE).trim() : Constants.SEARCH_PREFERENCE_LOCAL);
try {
SearchResponse response = builder.execute().actionGet(timeout);

2
src/main/java/org/codelibs/fess/es/client/FessEsClient.java
View file

@ -636,7 +636,7 @@ public class FessEsClient implements Client {
SearchResponse response =
client.prepareSearch(index).setTypes(type).setScroll(scrollForDelete).setSize(sizeForDelete)
.setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null).setQuery(queryBuilder)
.setPreference(Constants.SEARCH_PREFERENCE_PRIMARY).execute()
.setPreference(Constants.SEARCH_PREFERENCE_LOCAL).execute()
.actionGet(fessConfig.getIndexScrollSearchTimeoutTimeout());
int count = 0;

2
src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
View file

@ -174,7 +174,7 @@ public class CrawlingInfoHelper {
AggregationBuilders.terms(fessConfig.getIndexFieldSegment()).field(fessConfig.getIndexFieldSegment())
.size(maxSessionIdsInList).order(BucketOrder.key(false));
queryRequestBuilder.addAggregation(termsBuilder);
queryRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_PRIMARY);
queryRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL);
return true;
}, (queryRequestBuilder, execTime, searchResponse) -> {
final List<Map<String, String>> sessionIdList = new ArrayList<>();

4
src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
View file

@ -106,7 +106,7 @@ public class KeyMatchHelper {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(),
searchRequestBuilder -> {
return SearchConditionBuilder.builder(searchRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_PRIMARY))
return SearchConditionBuilder.builder(searchRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL))
.searchRequestType(SearchRequestType.ADMIN_SEARCH).size(keyMatch.getMaxSize()).query(keyMatch.getQuery())
.responseFields(new String[] { fessConfig.getIndexFieldDocId() }).build();
});
@ -147,7 +147,7 @@ public class KeyMatchHelper {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(),
searchRequestBuilder -> {
searchRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_PRIMARY).setQuery(pair.getFirst()).setSize(size);
searchRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL).setQuery(pair.getFirst()).setSize(size);
return true;
});
}

2
src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
View file

@ -1068,7 +1068,7 @@ public interface FessProp {
public default void processSearchPreference(final SearchRequestBuilder searchRequestBuilder, final OptionalThing<FessUserBean> userBean) {
userBean.map(user -> {
if (user.hasRoles(getAuthenticationAdminRolesAsArray())) {
return Constants.SEARCH_PREFERENCE_PRIMARY;
return Constants.SEARCH_PREFERENCE_LOCAL;
}
return user.getUserId();
}).ifPresent(p -> searchRequestBuilder.setPreference(p)).orElse(() -> LaRequestUtil.getOptionalRequest().map(r -> {