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

fix #634 expand variable

Browse source
This commit is contained in:
Kaoru FUZITA 2016-08-26 14:10:35 +09:00
parent 3f9e358e8d
commit bbfaa4deb3
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
View file

@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@ -1015,9 +1016,12 @@ public class AdminUpgradeAction extends FessAdminAction {
private void updateAnalysis(final IndicesAdminClient indicesClient, final String index, final String type, final String name,
final String source) {
try {
XContentParser contentParser = XContentFactory.xContent(XContentType.JSON).createParser(source.getBytes());
final String dictionaryPath = System.getProperty("fess.dictionary.path", StringUtil.EMPTY);
final XContentParser contentParser =
XContentFactory.xContent(XContentType.JSON).createParser(
source.replaceAll(Pattern.quote("${fess.dictionary.path}"), dictionaryPath).getBytes());
contentParser.close();
XContentBuilder builder =
final XContentBuilder builder =
jsonBuilder().startObject().startObject("analysis").startObject(type).field(name).copyCurrentStructure(contentParser)
.endObject().endObject().endObject();
indicesClient.prepareUpdateSettings(index).setSettings(builder.string()).execute().actionGet();
@ -1028,7 +1032,7 @@ public class AdminUpgradeAction extends FessAdminAction {
private void addData(final String index, final String type, final String id, final String source) {
try {
IndexRequest indexRequest = new IndexRequest(index, type, id).source(source);
final IndexRequest indexRequest = new IndexRequest(index, type, id).source(source);
fessEsClient.index(indexRequest).actionGet();
} catch (Exception e) {
logger.warn("Failed to add " + id + " to " + index + "/" + type, e);