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

modify token processing on deleteall

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-11-22 17:33:21 +09:00
parent 08a02f533a
commit 2e39e43493
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/codelibs/fess/app/service/CrawlingSessionService.java
View file

@ -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());

6
src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
View file

@ -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());
}

6
src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
View file

@ -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());
}
// ===================================================================================