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

modify validations

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-11-10 06:42:10 +09:00
parent 8f16885789
commit 3754776b70
1 changed files with 6 additions and 4 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/searchlist/AdminSearchlistAction.java
View file

@ -118,13 +118,13 @@ public class AdminSearchlistAction extends FessAdminAction {
}
protected HtmlResponse doSearch(final ListForm form) {
validate(form, messages -> {}, () -> asHtml(path_AdminSearchlist_IndexJsp));
if (StringUtil.isBlank(form.query)) {
// redirect to index page
form.query = null;
return redirect(getClass());
}
validate(form, messages -> {}, () -> asHtml(path_ErrorJsp));
return asHtml(path_AdminSearchlist_IndexJsp).renderWith(data -> {
doSearchInternal(data, form);
});
@ -139,7 +139,7 @@ public class AdminSearchlistAction extends FessAdminAction {
if (logger.isDebugEnabled()) {
logger.debug(e.getMessage(), e);
}
throwValidationError(e.getMessageCode(), () -> asHtml(path_ErrorJsp));
throwValidationError(e.getMessageCode(), () -> asHtml(path_AdminSearchlist_IndexJsp));
} catch (final ResultOffsetExceededException e) {
if (logger.isDebugEnabled()) {
logger.debug(e.getMessage(), e);
@ -192,14 +192,16 @@ public class AdminSearchlistAction extends FessAdminAction {
validate(form, messages -> {}, () -> asHtml(path_AdminSearchlist_IndexJsp));
final String docId = form.docId;
if (jobHelper.isCrawlProcessRunning()) {
throwValidationError(messages -> messages.addErrorsCannotDeleteDocBecauseOfRunning(GLOBAL), () -> asHtml(path_AdminSearchlist_IndexJsp));
throwValidationError(messages -> messages.addErrorsCannotDeleteDocBecauseOfRunning(GLOBAL),
() -> asHtml(path_AdminSearchlist_IndexJsp));
}
try {
final QueryBuilder query = QueryBuilders.termQuery(fieldHelper.docIdField, docId);
fessEsClient.deleteByQuery(fieldHelper.docIndex, fieldHelper.docType, query);
saveInfo(messages -> messages.addSuccessDeleteSolrIndex(GLOBAL));
} catch (final Exception e) {
throwValidationError(messages -> messages.addErrorsFailedToDeleteDocInAdmin(GLOBAL), () -> asHtml(path_AdminSearchlist_IndexJsp));
throwValidationError(messages -> messages.addErrorsFailedToDeleteDocInAdmin(GLOBAL),
() -> asHtml(path_AdminSearchlist_IndexJsp));
}
return redirectWith(getClass(), moreUrl("search").params("query", form.query));
}