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

fix #2644 add 14.0

Browse source
This commit is contained in:
Shinsuke Sugaya 2022-04-20 06:12:55 +09:00
parent fc448070ee
commit 6fcdd28095
2 changed files with 73 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,6 +79,10 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_13_16 = "13.16";
private static final String VERSION_13_17 = "13.17";
private static final String VERSION_14_0 = "14.0";
// ===================================================================================
// Attribute
//
@ -162,6 +166,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -189,6 +195,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -215,6 +223,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -240,6 +250,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -264,6 +276,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -287,6 +301,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -309,6 +325,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -330,6 +348,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -350,6 +370,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -369,6 +391,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -387,6 +411,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -404,6 +430,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -420,6 +448,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -435,6 +465,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -449,6 +481,8 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_14();
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -462,6 +496,8 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom13_15();
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -474,6 +510,8 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_13_16.equals(form.targetVersion)) {
try {
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -483,6 +521,31 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_16, e.getLocalizedMessage()));
}
} else if (VERSION_13_17.equals(form.targetVersion)) {
try {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_17, e.getLocalizedMessage()));
}
} else if (VERSION_14_0.equals(form.targetVersion)) {
try {
upgradeFrom14_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_0, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@ -555,6 +618,10 @@ public class AdminUpgradeAction extends FessAdminAction {
}
private void upgradeFrom13_16() {
// nothing
}
private void upgradeFrom13_17() {
final String[] configIndices = { //
"fess_config.access_token", //
"fess_config.bad_word", //
@ -619,6 +686,10 @@ public class AdminUpgradeAction extends FessAdminAction {
}
}
private void upgradeFrom14_0() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

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

@ -67,6 +67,8 @@
<la:option value="13.14">13.14</la:option>
<la:option value="13.15">13.15</la:option>
<la:option value="13.16">13.16</la:option>
<la:option value="13.17">13.17</la:option>
<la:option value="14.0">14.0</la:option>
</la:select>
</div>
</div>