From 2e39e43493db84b538d61a348407ff10339767ae Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@yahoo.co.jp>
Date: Sun, 22 Nov 2015 17:33:21 +0900
Subject: [PATCH] modify token processing on deleteall
---
.../codelibs/fess/app/service/CrawlingSessionService.java | 6 +++++-
.../app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java | 6 +++++-
.../app/web/admin/failureurl/AdminFailureurlAction.java | 6 +-----
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/codelibs/fess/app/service/CrawlingSessionService.java b/src/main/java/org/codelibs/fess/app/service/CrawlingSessionService.java
index d60e7b996..11a3215cf 100644
--- a/src/main/java/org/codelibs/fess/app/service/CrawlingSessionService.java
+++ b/src/main/java/org/codelibs/fess/app/service/CrawlingSessionService.java
@@ -208,7 +208,11 @@ public class CrawlingSessionService implements Serializable {
public void deleteOldSessions(final Set<String> activeSessionId) {
final List<CrawlingSession> activeSessionList = crawlingSessionBhv.selectList(cb -> {
- cb.query().setSessionId_InScope(activeSessionId);
+ if (activeSessionId.isEmpty()) {
+ cb.query().matchAll();
+ } else {
+ cb.query().setSessionId_InScope(activeSessionId);
+ }
cb.specify().columnId();
});
final List<String> idList = activeSessionList.stream().map(session -> session.getId()).collect(Collectors.toList());
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
index acd382063..215ace684 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
@@ -67,6 +67,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
@Execute
public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
+ saveToken();
crawlingSessionPager.setCurrentPageNumber(pageNumber);
return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
searchPaging(data, form);
@@ -75,6 +76,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
@Execute
public HtmlResponse search(final SearchForm form) {
+ saveToken();
copyBeanToBean(form, crawlingSessionPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
searchPaging(data, form);
@@ -83,6 +85,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
@Execute
public HtmlResponse reset(final SearchForm form) {
+ saveToken();
crawlingSessionPager.clear();
return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
searchPaging(data, form);
@@ -91,6 +94,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
@Execute
public HtmlResponse back(final SearchForm form) {
+ saveToken();
return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
searchPaging(data, form);
});
@@ -149,8 +153,8 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
@Execute
public HtmlResponse deleteall() {
verifyToken(() -> asListHtml());
- // FIXME:
crawlingSessionService.deleteOldSessions(jobHelper.getRunningSessionIdSet());
+ crawlingSessionPager.clear();
saveInfo(messages -> messages.addSuccessCrawlingSessionDeleteAll(GLOBAL));
return redirect(getClass());
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
index 09edf3537..772b04bc6 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
@@ -143,11 +143,7 @@ public class AdminFailureurlAction extends FessAdminAction {
failureUrlService.deleteAll(failureUrlPager);
failureUrlPager.clear();
saveInfo(messages -> messages.addSuccessFailureUrlDeleteAll(GLOBAL));
- return asHtml(path_AdminFailureurl_AdminFailureurlJsp).useForm(SearchForm.class, setup -> {
- setup.setup(form -> {
- copyBeanToBean(failureUrlPager, form, op -> {});
- });
- });
+ return redirect(getClass());
}
// ===================================================================================
--
GitLab