diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index 8d4eb1789..5f9983c7b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -181,7 +181,8 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { File file = getTargetFile(form).get(); if (file == null) { throwValidationError(messages -> messages.addErrorsTargetFileDoesNotExist(GLOBAL, form.fileName), toMainHtml()); - }; + } + return asStream(file.getName()).stream(out -> { try (FileInputStream fis = new FileInputStream(file)) { out.write(fis); @@ -302,4 +303,4 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { return asHtml(path_AdminDesign_AdminDesignJsp); }; } -} \ No newline at end of file +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java index 246a944f0..8f4a6bcd0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java @@ -124,6 +124,7 @@ public class AdminSearchlistAction extends FessAdminAction { form.query = null; return redirect(getClass()); } + validate(form, messages -> {}, () -> asHtml(path_ErrorJsp)); return asHtml(path_AdminSearchlist_IndexJsp).renderWith(data -> { doSearchInternal(data, form); }); @@ -177,7 +178,7 @@ public class AdminSearchlistAction extends FessAdminAction { if (pageNumber < 1) { pageNumber = 1; } - form.start = (pageNumber - 1) * form.num; + form.start = (pageNumber - 1) * form.getPageSize(); } return doSearch(form); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java index 1a0b8386b..25c309ddd 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java @@ -26,7 +26,6 @@ import org.codelibs.fess.entity.GeoInfo; import org.codelibs.fess.entity.SearchRequestParams; import org.codelibs.fess.helper.QueryHelper; import org.codelibs.fess.util.ComponentUtil; -import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; /** @@ -54,10 +53,10 @@ public class ListForm implements SearchRequestParams, Serializable { public String[] lang; - @Required + // @Required public String docId; - @Required + // @Required public String url; @Override @@ -95,31 +94,24 @@ public class ListForm implements SearchRequestParams, Serializable { public FacetInfo facet; - private int startPosition = -1; - - private int pageSize = -1; - @Override public int getStartPosition() { - if (startPosition != -1) { - return startPosition; + if (start == null) { + start = ComponentUtil.getQueryHelper().getDefaultStart(); } - startPosition = start; - return startPosition; + return start; } @Override public int getPageSize() { - if (pageSize != -1) { - return pageSize; - } final QueryHelper queryHelper = ComponentUtil.getQueryHelper(); - pageSize = num; - if (pageSize > queryHelper.getMaxPageSize() || pageSize <= 0) { - pageSize = queryHelper.getMaxPageSize(); + if (num == null) { + num = queryHelper.getDefaultPageSize(); } - num = pageSize; - return pageSize; + if (num > queryHelper.getMaxPageSize() || num <= 0) { + num = queryHelper.getMaxPageSize(); + } + return num; } @Override @@ -141,7 +133,7 @@ public class ListForm implements SearchRequestParams, Serializable { public String getSort() { return sort; } - + public void initialize() { final QueryHelper queryHelper = ComponentUtil.getQueryHelper(); if (start == null) { @@ -153,5 +145,5 @@ public class ListForm implements SearchRequestParams, Serializable { num = queryHelper.getMaxPageSize(); } } - + }