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

modify crawlingSession action

Browse source
This commit is contained in:
Shunji Makino 2015-09-16 16:53:59 +09:00
parent dde5969a6c
commit a97ccc5026
6 changed files with 242 additions and 362 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -112,8 +112,6 @@
<exclude>org/codelibs/fess/app/web/admin/SuggestElevateWordAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/LogForm.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/DataAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/CrawlingSessionAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/CrawlingSessionForm.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/WizardForm.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/FailureUrlForm.java</exclude>
<exclude>org/codelibs/fess/app/web/base/AbstractLoginAction.java</exclude>

343
src/main/java/org/codelibs/fess/app/web/admin/CrawlingSessionAction.java
View file

@ -1,343 +0,0 @@
/*
* Copyright 2009-2015 the CodeLibs Project and the Others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.admin;
import java.beans.Beans;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.crud.CommonConstants;
import org.codelibs.fess.crud.CrudMessageException;
import org.codelibs.fess.crud.util.SAStrutsUtil;
import org.codelibs.fess.es.exentity.CrawlingSession;
import org.codelibs.fess.es.exentity.CrawlingSessionInfo;
import org.codelibs.fess.helper.JobHelper;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.app.pager.CrawlingSessionPager;
import org.codelibs.fess.app.service.CrawlingSessionService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CrawlingSessionAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(CrawlingSessionAction.class);
//for list
public List<CrawlingSession> crawlingSessionItems;
// for edit/confirm/delete
//@ActionForm
@Resource
protected CrawlingSessionForm crawlingSessionForm;
@Resource
protected CrawlingSessionService crawlingSessionService;
@Resource
protected CrawlingSessionPager crawlingSessionPager;
@Resource
protected SystemHelper systemHelper;
@Resource
protected JobHelper jobHelper;
public String getHelpLink() {
return systemHelper.getHelpLink("crawlingSession");
}
protected String displayList(final boolean redirect) {
// page navi
crawlingSessionItems = crawlingSessionService.getCrawlingSessionList(crawlingSessionPager);
// restore from pager
BeanUtil.copyBeanToBean(crawlingSessionPager, crawlingSessionForm.searchParams,
option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE));
if (redirect) {
return "index?redirect=true";
} else {
return "index.jsp";
}
}
public List<CrawlingSessionInfo> getCrawlingSessionInfoItems() {
if (crawlingSessionForm.id != null) {
return crawlingSessionService.getCrawlingSessionInfoList(crawlingSessionForm.id);
}
return Collections.emptyList();
}
//@Execute(validator = false, input = "error.jsp")
public String deleteall() {
crawlingSessionService.deleteOldSessions(jobHelper.getRunningSessionIdSet());
SAStrutsUtil.addSessionMessage("success.crawling_session_delete_all");
return displayList(true);
}
//@Execute(validator = false, input = "error.jsp")
public String index() {
return displayList(false);
}
//@Execute(validator = false, input = "error.jsp", urlPattern = "list/{pageNumber}")
public String list() {
// page navi
if (StringUtil.isNotBlank(crawlingSessionForm.pageNumber)) {
try {
crawlingSessionPager.setCurrentPageNumber(Integer.parseInt(crawlingSessionForm.pageNumber));
} catch (final NumberFormatException e) {
if (logger.isDebugEnabled()) {
logger.debug("Invalid value: " + crawlingSessionForm.pageNumber, e);
}
}
}
return displayList(false);
}
//@Execute(validator = false, input = "error.jsp")
public String search() {
BeanUtil.copyBeanToBean(crawlingSessionForm.searchParams, crawlingSessionPager,
option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE));
return displayList(false);
}
//@Execute(validator = false, input = "error.jsp")
public String reset() {
crawlingSessionPager.clear();
return displayList(false);
}
//@Execute(validator = false, input = "error.jsp")
public String back() {
return displayList(false);
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp")
public String editagain() {
return "edit.jsp";
}
//@Execute(validator = false, input = "error.jsp", urlPattern = "confirmpage/{crudMode}/{id}")
public String confirmpage() {
if (crawlingSessionForm.crudMode != CommonConstants.CONFIRM_MODE) {
throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.CONFIRM_MODE,
crawlingSessionForm.crudMode });
}
loadCrawlingSession();
return "confirm.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp")
public String createpage() {
// page navi
crawlingSessionForm.initialize();
crawlingSessionForm.crudMode = CommonConstants.CREATE_MODE;
return "edit.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp", urlPattern = "editpage/{crudMode}/{id}")
public String editpage() {
if (crawlingSessionForm.crudMode != CommonConstants.EDIT_MODE) {
throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.EDIT_MODE,
crawlingSessionForm.crudMode });
}
loadCrawlingSession();
return "edit.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp")
public String editfromconfirm() {
crawlingSessionForm.crudMode = CommonConstants.EDIT_MODE;
loadCrawlingSession();
return "edit.jsp";
}
@Token(save = false, validate = true, keep = true)
//@Execute(validator = true, input = "edit.jsp")
public String confirmfromcreate() {
return "confirm.jsp";
}
@Token(save = false, validate = true, keep = true)
//@Execute(validator = true, input = "edit.jsp")
public String confirmfromupdate() {
return "confirm.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp", urlPattern = "deletepage/{crudMode}/{id}")
public String deletepage() {
if (crawlingSessionForm.crudMode != CommonConstants.DELETE_MODE) {
throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE,
crawlingSessionForm.crudMode });
}
loadCrawlingSession();
return "confirm.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp")
public String deletefromconfirm() {
crawlingSessionForm.crudMode = CommonConstants.DELETE_MODE;
loadCrawlingSession();
return "confirm.jsp";
}
@Token(save = false, validate = true)
//@Execute(validator = true, input = "edit.jsp")
public String create() {
try {
final CrawlingSession crawlingSession = createCrawlingSession();
crawlingSessionService.store(crawlingSession);
SAStrutsUtil.addSessionMessage("success.crud_create_crud_table");
return displayList(true);
} catch (final ActionMessagesException e) {
logger.error(e.getMessage(), e);
throw e;
} catch (final CrudMessageException e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException(e.getMessageId(), e.getArgs());
} catch (final Exception e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException("errors.crud_failed_to_create_crud_table");
}
}
@Token(save = false, validate = true)
//@Execute(validator = true, input = "edit.jsp")
public String update() {
try {
final CrawlingSession crawlingSession = createCrawlingSession();
crawlingSessionService.store(crawlingSession);
SAStrutsUtil.addSessionMessage("success.crud_update_crud_table");
return displayList(true);
} catch (final ActionMessagesException e) {
logger.error(e.getMessage(), e);
throw e;
} catch (final CrudMessageException e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException(e.getMessageId(), e.getArgs());
} catch (final Exception e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException("errors.crud_failed_to_update_crud_table");
}
}
@Token(save = false, validate = true)
//@Execute(validator = false, input = "error.jsp")
public String delete() {
if (crawlingSessionForm.crudMode != CommonConstants.DELETE_MODE) {
throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE,
crawlingSessionForm.crudMode });
}
try {
final CrawlingSession crawlingSession = crawlingSessionService.getCrawlingSession(createKeyMap());
if (crawlingSession == null) {
// throw an exception
throw new ActionMessagesException("errors.crud_could_not_find_crud_table",
new Object[] { crawlingSessionForm.id });
}
crawlingSessionService.delete(crawlingSession);
SAStrutsUtil.addSessionMessage("success.crud_delete_crud_table");
return displayList(true);
} catch (final ActionMessagesException e) {
logger.error(e.getMessage(), e);
throw e;
} catch (final CrudMessageException e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException(e.getMessageId(), e.getArgs());
} catch (final Exception e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException("errors.crud_failed_to_delete_crud_table");
}
}
protected void loadCrawlingSession() {
final CrawlingSession crawlingSession = crawlingSessionService.getCrawlingSession(createKeyMap());
if (crawlingSession == null) {
// throw an exception
throw new ActionMessagesException("errors.crud_could_not_find_crud_table",
new Object[] { crawlingSessionForm.id });
}
BeanUtil.copyBeanToBean(crawlingSession, crawlingSessionForm, option -> option.exclude("searchParams", "mode"));
}
protected CrawlingSession createCrawlingSession() {
CrawlingSession crawlingSession;
if (crawlingSessionForm.crudMode == CommonConstants.EDIT_MODE) {
crawlingSession = crawlingSessionService.getCrawlingSession(createKeyMap());
if (crawlingSession == null) {
// throw an exception
throw new ActionMessagesException("errors.crud_could_not_find_crud_table",
new Object[] { crawlingSessionForm.id });
}
} else {
crawlingSession = new CrawlingSession();
}
BeanUtil.copyBeanToBean(crawlingSessionForm, crawlingSession, option -> option.exclude("searchParams", "mode"));
return crawlingSession;
}
protected Map<String, String> createKeyMap() {
final Map<String, String> keys = new HashMap<String, String>();
keys.put("id", crawlingSessionForm.id);
return keys;
}
}

201
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java Normal file
View file

@ -0,0 +1,201 @@
/*
* Copyright 2009-2015 the CodeLibs Project and the Others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.admin.crawlingsession;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.CrawlingSessionPager;
import org.codelibs.fess.app.service.CrawlingSessionService;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.crud.CommonConstants;
import org.codelibs.fess.es.exentity.CrawlingSession;
import org.codelibs.fess.helper.JobHelper;
import org.codelibs.fess.helper.SystemHelper;
import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.validation.VaErrorHook;
/**
* @author shinsuke
* @author Shunji Makino
*/
public class AdminCrawlingsessionAction extends FessAdminAction {
// ===================================================================================
// Attribute
// =========
@Resource
private CrawlingSessionService crawlingSessionService;
@Resource
private CrawlingSessionPager crawlingSessionPager;
@Resource
private SystemHelper systemHelper;
@Resource
protected JobHelper jobHelper;
// ===================================================================================
// Hook
// ======
@Override
protected void setupHtmlData(final ActionRuntime runtime) {
super.setupHtmlData(runtime);
runtime.registerData("helpLink", systemHelper.getHelpLink("crawlingSession"));
}
// ===================================================================================
// Search Execute
// ==============
@Execute
public HtmlResponse deleteall(final CrawlingSessionEditForm form) {
crawlingSessionService.deleteOldSessions(jobHelper.getRunningSessionIdSet());
saveInfo(messages -> messages.addSuccessCrawlingSessionDeleteAll(GLOBAL));
return redirect(getClass());
}
@Execute
public HtmlResponse index(final CrawlingSessionSearchForm form) {
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse list(final Integer pageNumber, final CrawlingSessionSearchForm form) {
crawlingSessionPager.setCurrentPageNumber(pageNumber);
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse search(final CrawlingSessionSearchForm form) {
copyBeanToBean(form.searchParams, crawlingSessionPager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse reset(final CrawlingSessionSearchForm form) {
crawlingSessionPager.clear();
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse back(final CrawlingSessionSearchForm form) {
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
protected void searchPaging(final RenderData data, final CrawlingSessionSearchForm form) {
data.register("crawlingSessionItems", crawlingSessionService.getCrawlingSessionList(crawlingSessionPager)); // page navi
// restore from pager
copyBeanToBean(crawlingSessionPager, form.searchParams, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
}
// ===================================================================================
// Edit Execute
// ============
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
public HtmlResponse deletepage(final int crudMode, final String id, final CrawlingSessionEditForm form) {
form.crudMode = crudMode;
form.id = id;
verifyCrudMode(form, CommonConstants.DELETE_MODE);
loadCrawlingSession(form);
return asHtml(path_AdminCrawlingsession_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
public HtmlResponse deletefromconfirm(final CrawlingSessionEditForm form) {
form.crudMode = CommonConstants.DELETE_MODE;
loadCrawlingSession(form);
return asHtml(path_AdminCrawlingsession_ConfirmJsp);
}
// -----------------------------------------------------
// Confirm
// -------
@Execute
public HtmlResponse confirmpage(final int crudMode, final String id, final CrawlingSessionEditForm form) {
form.crudMode = crudMode;
form.id = id;
verifyCrudMode(form, CommonConstants.CONFIRM_MODE);
loadCrawlingSession(form);
return asHtml(path_AdminCrawlingsession_ConfirmJsp);
}
// -----------------------------------------------------
// Actually Crud
// -------------
@Execute
public HtmlResponse delete(final CrawlingSessionEditForm form) {
verifyCrudMode(form, CommonConstants.DELETE_MODE);
crawlingSessionService.delete(getCrawlingSession(form));
saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
return redirect(getClass());
}
// ===================================================================================
// Assist Logic
// ============
protected void loadCrawlingSession(final CrawlingSessionEditForm form) {
copyBeanToBean(getCrawlingSession(form), form, op -> op.exclude("crudMode"));
}
protected CrawlingSession getCrawlingSession(final CrawlingSessionEditForm form) {
final CrawlingSession crawlingSession = crawlingSessionService.getCrawlingSession(createKeyMap(form));
return crawlingSession;
}
protected Map<String, String> createKeyMap(final CrawlingSessionEditForm form) {
final Map<String, String> keys = new HashMap<String, String>();
keys.put("id", form.id);
return keys;
}
// ===================================================================================
// Small Helper
// ============
protected void verifyCrudMode(final CrawlingSessionEditForm form, final int expectedMode) {
if (form.crudMode != expectedMode) {
throwValidationError(messages -> {
messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode));
}, toIndexHtml());
}
}
protected VaErrorHook toIndexHtml() {
return () -> {
return asHtml(path_AdminCrawlingsession_IndexJsp);
};
}
}

20
src/main/java/org/codelibs/fess/app/web/admin/CrawlingSessionForm.java → src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/CrawlingSessionEditForm.java
View file

@ -14,28 +14,21 @@
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.admin;
package org.codelibs.fess.app.web.admin.crawlingsession;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
public class CrawlingSessionForm implements Serializable {
/**
* @author codelibs
* @author Shunji Makino
*/
public class CrawlingSessionEditForm implements Serializable {
private static final long serialVersionUID = 1L;
//@IntegerType
public String pageNumber;
public Map<String, String> searchParams = new HashMap<String, String>();
//@IntegerType
public int crudMode;
public String getCurrentPageNumber() {
return pageNumber;
}
//@Required(target = "confirmfromupdate,update,delete")
//@Maxbytelength(maxbytelength = 1000)
public String id;
@ -63,5 +56,4 @@ public class CrawlingSessionForm implements Serializable {
createdTime = null;
}
}

32
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/CrawlingSessionSearchForm.java Normal file
View file

@ -0,0 +1,32 @@
/*
* Copyright 2009-2015 the CodeLibs Project and the Others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.admin.crawlingsession;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/**
* @author codelibs
* @author Shunji Makino
*/
public class CrawlingSessionSearchForm implements Serializable {
private static final long serialVersionUID = 1L;
public Map<String, String> searchParams = new HashMap<String, String>();
}

6
src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp
View file

@ -204,12 +204,12 @@
<span><la:message key="labels.menu.jobLog" /></span>
</la:link></li>
<li <c:if test="${param.menuType=='crawlingSession'}">class="active"</c:if>><todo:link
href="/admin/crawlingSession/index"
<li <c:if test="${param.menuType=='crawlingSession'}">class="active"</c:if>><la:link
href="/admin/crawlingsession/index"
>
<i class='fa fa-angle-right'></i>
<span><la:message key="labels.menu.session_info" /></span>
</todo:link></li>
</la:link></li>
<li <c:if test="${param.menuType=='log'}">class="active"</c:if>><todo:link href="/admin/log/index">
<i class='fa fa-angle-right'></i>