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

fix #1477 modify virtual host handling

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-02-01 20:57:31 +09:00
parent bd754fd01a
commit fb695477a6
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.Pair;
import org.codelibs.fess.Constants;
import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
@ -78,7 +79,10 @@ public class KeyMatchHelper {
});
if (boolQuery.hasClauses()) {
final String virtualHost = keyMatch.getVirtualHost();
String virtualHost = keyMatch.getVirtualHost();
if (StringUtil.isBlank(virtualHost)) {
virtualHost = StringUtil.EMPTY;
}
Map<String, Pair<QueryBuilder, ScoreFunctionBuilder<?>>> queryMap = keyMatchQueryMap.get(virtualHost);
if (queryMap == null) {
queryMap = new HashMap<>();

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

@ -121,7 +121,7 @@ public class SearchLogHelper {
searchLog.setLanguages(StringUtil.EMPTY);
}
final String virtualHostKey = ComponentUtil.getVirtualHostHelper().getVirtualHostKey();
if (virtualHostKey != null) {
if (StringUtil.isNotBlank(virtualHostKey)) {
searchLog.setVirtualHost(virtualHostKey);
} else {
searchLog.setVirtualHost(StringUtil.EMPTY);

1
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -358,6 +358,7 @@ public class SystemHelper {
ComponentUtil.getLdapManager().updateConfig();
ComponentUtil.getRelatedContentHelper().update();
ComponentUtil.getRelatedQueryHelper().update();
ComponentUtil.getKeyMatchHelper().update();
}
public String updateConfiguration() {