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

rename to crawlinginfo

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-11-08 10:05:47 +09:00
parent 56e1003c3b
commit 19451a3b07
10 changed files with 70 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -233,6 +233,7 @@ public class CrawlingSessionService implements Serializable {
}
public void importCsv(final Reader reader) {
@SuppressWarnings("resource")
final CsvReader csvReader = new CsvReader(reader, new CsvConfig());
final DateFormat formatter = new SimpleDateFormat(CoreLibConstants.DATE_FORMAT_ISO_8601_EXTEND);
try {

39
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java → src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
View file

@ -13,7 +13,7 @@
* 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;
package org.codelibs.fess.app.web.admin.crawlinginfo;
import javax.annotation.Resource;
@ -34,7 +34,7 @@ import org.lastaflute.web.validation.VaErrorHook;
* @author shinsuke
* @author Shunji Makino
*/
public class AdminCrawlingsessionAction extends FessAdminAction {
public class AdminCrawlinginfoAction extends FessAdminAction {
// ===================================================================================
// Attribute
@ -54,7 +54,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
@Override
protected void setupHtmlData(final ActionRuntime runtime) {
super.setupHtmlData(runtime);
runtime.registerData("helpLink", systemHelper.getHelpLink("crawlingSession"));
runtime.registerData("helpLink", systemHelper.getHelpLink("crawlingInfo"));
}
// ===================================================================================
@ -70,7 +70,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
@Execute
public HtmlResponse index(final SearchForm form) {
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@ -78,7 +78,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
@Execute
public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
crawlingSessionPager.setCurrentPageNumber(pageNumber);
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@ -86,7 +86,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
@Execute
public HtmlResponse search(final SearchForm form) {
copyBeanToBean(form, crawlingSessionPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@ -94,14 +94,14 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
@Execute
public HtmlResponse reset(final SearchForm form) {
crawlingSessionPager.clear();
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse back(final SearchForm form) {
return asHtml(path_AdminCrawlingsession_IndexJsp).renderWith(data -> {
return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@ -116,25 +116,6 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
// ===================================================================================
// Edit Execute
// ============
// -----------------------------------------------------
// Entry Page
// ----------
@Execute
//(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
form.crudMode = CrudMode.DELETE;
validate(form, messages -> {}, toIndexHtml());
final String id = form.id;
crawlingSessionService.getCrawlingSession(id).ifPresent(entity -> {
copyBeanToBean(entity, form, op -> {});
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toIndexHtml());
});
return asHtml(path_AdminCrawlingsession_DetailsJsp).renderWith(data -> {
data.register("crawlingSessionInfoItems", crawlingSessionService.getCrawlingSessionInfoList(id));
});
}
// -----------------------------------------------------
// Details
@ -142,7 +123,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
@Execute
public HtmlResponse details(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DETAILS);
return asHtml(path_AdminCrawlingsession_DetailsJsp).useForm(EditForm.class, op -> {
return asHtml(path_AdminCrawlinginfo_CrawlinginfoDetailsJsp).useForm(EditForm.class, op -> {
op.setup(form -> {
crawlingSessionService.getCrawlingSession(id).ifPresent(entity -> {
copyBeanToBean(entity, form, copyOp -> {
@ -190,7 +171,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
protected VaErrorHook toIndexHtml() {
return () -> {
return asHtml(path_AdminCrawlingsession_IndexJsp);
return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp);
};
}
}

2
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/EditForm.java → src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java
View file

@ -13,7 +13,7 @@
* 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;
package org.codelibs.fess.app.web.admin.crawlinginfo;
import java.io.Serializable;

3
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/SearchForm.java → src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/SearchForm.java
View file

@ -13,7 +13,7 @@
* 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;
package org.codelibs.fess.app.web.admin.crawlinginfo;
import java.io.Serializable;
@ -26,4 +26,5 @@ public class SearchForm implements Serializable {
private static final long serialVersionUID = 1L;
public String sessionId;
}

8
src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
View file

@ -32,11 +32,11 @@ public interface FessHtmlPath {
/** The path of the HTML: /admin/boostdocumentrule/index.jsp */
HtmlNext path_AdminBoostdocumentrule_IndexJsp = new HtmlNext("/admin/boostdocumentrule/index.jsp");
/** The path of the HTML: /admin/crawlingsession/details.jsp */
HtmlNext path_AdminCrawlingsession_DetailsJsp = new HtmlNext("/admin/crawlingsession/details.jsp");
/** The path of the HTML: /admin/crawlinginfo/crawlinginfo_details.jsp */
HtmlNext path_AdminCrawlinginfo_CrawlinginfoDetailsJsp = new HtmlNext("/admin/crawlinginfo/crawlinginfo_details.jsp");
/** The path of the HTML: /admin/crawlingsession/index.jsp */
HtmlNext path_AdminCrawlingsession_IndexJsp = new HtmlNext("/admin/crawlingsession/index.jsp");
/** The path of the HTML: /admin/crawlinginfo/crawlinginfo_list.jsp */
HtmlNext path_AdminCrawlinginfo_CrawlinginfoListJsp = new HtmlNext("/admin/crawlinginfo/crawlinginfo_list.jsp");
/** The path of the HTML: /admin/dashboard/dashboard.jsp */
HtmlNext path_AdminDashboard_DashboardJsp = new HtmlNext("/admin/dashboard/dashboard.jsp");

8
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
View file

@ -605,8 +605,8 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Config Info */
public static final String LABELS_menu_system_info = "{labels.menu_system_info}";
/** The key of the message: Session Info */
public static final String LABELS_menu_session_info = "{labels.menu_session_info}";
/** The key of the message: Crawling Info */
public static final String LABELS_menu_crawling_info = "{labels.menu_crawling_info}";
/** The key of the message: Log Files */
public static final String LABELS_menu_log = "{labels.menu_log}";
@ -1505,7 +1505,7 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Purge Suggest Docs by Search Words */
public static final String LABELS_purge_suggest_search_log_day = "{labels.purge_suggest_search_log_day}";
/** The key of the message: Session Information */
/** The key of the message: Crawling Information */
public static final String LABELS_crawling_session_title = "{labels.crawling_session_title}";
/** The key of the message: Crawling Information */
@ -1517,7 +1517,7 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Delete */
public static final String LABELS_crawling_session_button_delete = "{labels.crawling_session_button_delete}";
/** The key of the message: Crawling Session */
/** The key of the message: Crawling Info */
public static final String LABELS_crawling_session_configuration = "{labels.crawling_session_configuration}";
/** The key of the message: Search */

7
src/main/resources/fess_label.properties
View file

@ -167,6 +167,7 @@ labels.synonymFile=Synonym File
labels.userDictFile=Kuromoji File
labels.suggestElevateWordFile=Additional Word File
labels.suggestBadWordFile=Bad Word File
labels.menu_system=System
labels.menu_wizard=Wizard
labels.menu_crawl_config=General
@ -197,7 +198,7 @@ labels.menu_suggest_elevate_word=Additional Word
labels.menu_suggest_bad_word=Bad Word
labels.menu_system_log=System Info
labels.menu_system_info=Config Info
labels.menu_session_info=Session Info
labels.menu_crawling_info=Crawling Info
labels.menu_log=Log Files
labels.menu_jobLog=Job Log
labels.menu_failure_url=Failure URL
@ -508,11 +509,11 @@ labels.suggest_type_content=content
labels.suggest_type_searchlog=search words
labels.suggest_search_log_enabled=Suggest by Search Words
labels.purge_suggest_search_log_day=Purge Suggest Docs by Search Words
labels.crawling_session_title=Session Information
labels.crawling_session_title=Crawling Information
labels.crawling_session_title_confirm=Crawling Information
labels.crawling_session_button_back=Back
labels.crawling_session_button_delete=Delete
labels.crawling_session_configuration=Crawling Session
labels.crawling_session_configuration=Crawling Info
labels.crawling_session_search=Search
labels.crawling_session_reset=Reset
labels.crawling_session_link_list=List

76
src/main/webapp/WEB-INF/view/admin/crawlingsession/details.jsp → src/main/webapp/WEB-INF/view/admin/crawlinginfo/crawlinginfo_details.jsp
View file

@ -22,21 +22,9 @@
<la:message key="labels.crawling_session_title_confirm" />
</h1>
<ol class="breadcrumb">
<li><la:link href="/admin/crawlingsession">
<li><la:link href="/admin/crawlinginfo">
<la:message key="labels.crawling_session_link_list" />
</la:link></li>
<c:if test="${crudMode == 1}">
<li class="active"><a href="#"><la:message
key="labels.crawling_session_link_create" /></a></li>
</c:if>
<c:if test="${crudMode == 2}">
<li class="active"><a href="#"><la:message
key="labels.crawling_session_link_update" /></a></li>
</c:if>
<c:if test="${crudMode == 3}">
<li class="active"><a href="#"><la:message
key="labels.crawling_session_link_delete" /></a></li>
</c:if>
<c:if test="${crudMode == 4}">
<li class="active"><a href="#"><la:message
key="labels.crawling_session_link_details" /></a></li>
@ -47,9 +35,9 @@
<section class="content">
<%-- Form --%>
<la:form>
<la:form action="/admin/crawlinginfo">
<la:hidden property="crudMode" />
<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
<c:if test="${crudMode==4}">
<la:hidden property="id" />
</c:if>
<div class="row">
@ -91,37 +79,49 @@
</div>
<%-- Box Footer --%>
<div class="box-footer">
<c:if test="${crudMode == 1}">
<button type="submit" class="btn" name="back"
value="<la:message key="labels.crawling_session_button_back" />">
<la:message key="labels.crawling_session_button_back" />
</button>
</c:if>
<c:if test="${crudMode == 2}">
<button type="submit" class="btn" name="back"
value="<la:message key="labels.crawling_session_button_back" />">
<la:message key="labels.crawling_session_button_back" />
</button>
</c:if>
<c:if test="${crudMode == 3}">
<button type="submit" class="btn" name="back"
value="<la:message key="labels.crawling_session_button_back" />">
<la:message key="labels.crawling_session_button_back" />
</button>
<button type="submit" class="btn btn-danger" name="delete"
value="<la:message key="labels.crawling_session_button_delete" />">
<la:message key="labels.crawling_session_button_delete" />
</button>
</c:if>
<c:if test="${crudMode == 4}">
<button type="submit" class="btn" name="back"
value="<la:message key="labels.crawling_session_button_back" />">
<la:message key="labels.crawling_session_button_back" />
</button>
<button type="submit" class="btn btn-danger" name="deletefromconfirm"
<button type="button" class="btn btn-danger" name="delete"
data-toggle="modal" data-target="#confirmToDelete"
value="<la:message key="labels.crawling_session_button_delete" />">
<la:message key="labels.crawling_session_button_delete" />
</button>
<div class="modal modal-danger fade" id="confirmToDelete" tabindex="-1"
role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title">
<la:message key="labels.crud_title_delete" />
</h4>
</div>
<div class="modal-body">
<p>
<la:message key="labels.crud_delete_confirmation" />
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline pull-left"
data-dismiss="modal">
<la:message key="labels.crud_button_cancel" />
</button>
<button type="submit" class="btn btn-outline btn-danger"
name="delete"
value="<la:message key="labels.crud_button_delete" />">
<i class="fa fa-trash"></i>
<la:message key="labels.crud_button_delete" />
</button>
</div>
</div>
</div>
</div>
</c:if>
</div>
</div>

6
src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp → src/main/webapp/WEB-INF/view/admin/crawlinginfo/crawlinginfo_list.jsp
View file

@ -19,7 +19,7 @@
<la:message key="labels.crawling_session_configuration" />
</h1>
<ol class="breadcrumb">
<li class="active"><la:link href="/admin/crawlingsession">
<li class="active"><la:link href="/admin/crawlinginfo">
<la:message key="labels.crawling_session_title" />
</la:link></li>
</ol>
@ -45,7 +45,7 @@
</div>
<div class="row">
<div class="col-sm-12">
<la:form styleClass="form-inline">
<la:form styleClass="form-inline" action="/admin/crawlinginfo">
<div class="form-group">
<c:set var="ph_session_id">
<la:message key="labels.crawling_session_session_id_search" />
@ -93,7 +93,7 @@
<c:forEach var="data" varStatus="s"
items="${crawlingSessionItems}">
<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
data-href="${contextPath}/admin/crawlingsession/details/4/${f:u(data.id)}">
data-href="${contextPath}/admin/crawlinginfo/details/4/${f:u(data.id)}">
<td>${f:h(data.sessionId)}</td>
<td><fmt:formatDate
value="${fe:date(data.createdTime)}"

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

@ -231,10 +231,10 @@
</la:link></li>
<li
<c:if test="${param.menuType=='crawlingSession'}">class="active"</c:if>><la:link
href="/admin/crawlingsession/">
<c:if test="${param.menuType=='crawlingInfo'}">class="active"</c:if>><la:link
href="/admin/crawlinginfo/">
<i class='fa fa-circle-o'></i>
<span><la:message key="labels.menu_session_info" /></span>
<span><la:message key="labels.menu_crawling_info" /></span>
</la:link></li>
<li <c:if test="${param.menuType=='log'}">class="active"</c:if>><la:link