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

add crawling session info

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-10-29 16:00:52 +09:00
parent eeffb888a6
commit 9098cfcb4a
5 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,14 +95,18 @@ public class CrawlingSessionService implements Serializable {
public void store(final CrawlingSession crawlingSession) {
setupStoreCondition(crawlingSession);
crawlingSessionBhv.insertOrUpdate(crawlingSession);
crawlingSessionBhv.insertOrUpdate(crawlingSession, op -> {
op.setRefresh(true);
});
}
public void delete(final CrawlingSession crawlingSession) {
setupDeleteCondition(crawlingSession);
crawlingSessionBhv.delete(crawlingSession);
crawlingSessionBhv.delete(crawlingSession, op -> {
op.setRefresh(true);
});
}

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

@ -121,22 +121,6 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminCrawlingsession_ConfirmJsp).useForm(EditForm.class, op -> {
op.setup(form -> {
crawlingSessionService.getCrawlingSession(id).ifPresent(entity -> {
copyBeanToBean(entity, form, copyOp -> {
copyOp.excludeNull();
});
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toIndexHtml());
});
form.crudMode = crudMode;
});
});
}
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
@ -148,7 +132,9 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toIndexHtml());
});
return asHtml(path_AdminCrawlingsession_ConfirmJsp);
return asHtml(path_AdminCrawlingsession_ConfirmJsp).renderWith(data -> {
data.register("crawlingSessionInfoItems", crawlingSessionService.getCrawlingSessionInfoList(id));
});
}
// -----------------------------------------------------
@ -168,6 +154,8 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toIndexHtml());
});
});
}).renderWith(data -> {
data.register("crawlingSessionInfoItems", crawlingSessionService.getCrawlingSessionInfoList(id));
});
}

12
src/main/java/org/codelibs/fess/es/exentity/CrawlingSession.java
View file

@ -1,5 +1,7 @@
package org.codelibs.fess.es.exentity;
import java.util.List;
import org.codelibs.fess.es.bsentity.BsCrawlingSession;
/**
@ -9,6 +11,8 @@ public class CrawlingSession extends BsCrawlingSession {
private static final long serialVersionUID = 1L;
private List<CrawlingSessionInfo> crawlingSessionInfoList;
public CrawlingSession() {
}
@ -33,4 +37,12 @@ public class CrawlingSession extends BsCrawlingSession {
public void setVersionNo(final Long version) {
asDocMeta().version(version);
}
public void setCrawlingSessionInfoList(List<CrawlingSessionInfo> crawlingSessionInfoList) {
this.crawlingSessionInfoList = crawlingSessionInfoList;
}
public List<CrawlingSessionInfo> getCrawlingSessionInfoList() {
return crawlingSessionInfoList;
}
}

4
src/main/java/org/codelibs/fess/job/CrawlJob.java
View file

@ -250,8 +250,8 @@ public class CrawlJob {
// WEB-INF/lib
appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/lib")), "WEB-INF/lib" + File.separator);
// WEB-INF/crawler/lib
appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/crawler/lib")), "WEB-INF/crawler" + File.separator + "lib"
+ File.separator);
appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/crawler/lib")), "WEB-INF/crawler" + File.separator
+ "lib" + File.separator);
final File targetLibDir = new File(targetDir, "fess" + File.separator + "WEB-INF" + File.separator + "lib");
if (targetLibDir.isDirectory()) {
appendJarFile(cpSeparator, buf, targetLibDir, targetLibDir.getAbsolutePath() + File.separator);

4
src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp
View file

@ -98,10 +98,6 @@
<td><a href="${f:url('/admin/searchlist/search')}?query=segment:${f:u(sessionId)}">${f:h(sessionId)}</a>
<la:hidden property="sessionId" /></td>
</tr>
<tr>
<th><la:message key="labels.crawling_session_name" /></th>
<td>${f:h(sessionId)}</td>
</tr>
<c:forEach var="info" items="${crawlingSessionInfoItems}">
<tr>
<th>${f:h(info.keyMsg)}</th>