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

fix #712 update upgrade page

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-09-29 17:19:48 +09:00
parent 8765d7672b
commit 3280c0a042
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,7 @@ import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
import org.elasticsearch.action.index.IndexRequest;
@ -217,7 +218,17 @@ public class AdminUpgradeAction extends FessAdminAction {
}
private void upgradeFrom10_2() {
// TODO
final IndicesAdminClient indicesClient = fessEsClient.admin().indices();
final String configIndex = ".fess_config";
final String updateIndex = fessConfig.getIndexDocumentUpdateIndex();
final String searchIndex = fessConfig.getIndexDocumentSearchIndex();
// update mapping
addFieldMapping(indicesClient, updateIndex, "doc", "filename",
"{\"properties\":{\"filename\":{\"type\":\"string\",\"index\":\"not_analyzed\"}}}");
addFieldMapping(indicesClient, searchIndex, "doc", "filename",
"{\"properties\":{\"filename\":{\"type\":\"string\",\"index\":\"not_analyzed\"}}}");
addFieldMapping(indicesClient, configIndex, "job_log", "lastUpdated", "{\"properties\":{\"lastUpdated\":{\"type\":\"long\"}}}");
}
private void upgradeFrom10_1() {
@ -1023,7 +1034,8 @@ public class AdminUpgradeAction extends FessAdminAction {
final String source) {
final GetFieldMappingsResponse gfmResponse =
indicesClient.prepareGetFieldMappings(index).addTypes(type).setFields(field).execute().actionGet();
if (gfmResponse.fieldMappings(index, type, field).isNull()) {
final FieldMappingMetaData fieldMappings = gfmResponse.fieldMappings(index, type, field);
if (fieldMappings == null || fieldMappings.isNull()) {
try {
final PutMappingResponse pmResponse =
indicesClient.preparePutMapping(index).setType(type).setSource(source).execute().actionGet();

1
src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
View file

@ -44,6 +44,7 @@
<div class="col-sm-9">
<la:errors property="targetVersion" />
<la:select property="targetVersion" styleClass="form-control">
<la:option value="10.2">10.2</la:option>
<la:option value="10.1">10.1</la:option>
<la:option value="10.0">10.0</la:option>
</la:select>