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

Add search option for relatedquery

Browse source
This commit is contained in:
Ryo Kuramoto 2019-12-11 16:18:29 +09:00
parent c512fcacfb
commit 0eca099e9d
No known key found for this signature in database
GPG key ID: F7A69369FE4CDA37
5 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import java.util.List;
import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.RelatedQueryPager;
import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
@ -70,8 +71,11 @@ public class RelatedQueryService {
}
protected void setupListCondition(final RelatedQueryCB cb, final RelatedQueryPager relatedQueryPager) {
if (relatedQueryPager.id != null) {
cb.query().docMeta().setId_Equal(relatedQueryPager.id);
if (StringUtil.isNotBlank(relatedQueryPager.term)) {
cb.query().setTerm_Wildcard(relatedQueryPager.term);
}
if (StringUtil.isNotBlank(relatedQueryPager.queries)) {
cb.query().setQueries_Wildcard(relatedQueryPager.queries);
}
// TODO Long, Integer, String supported only.

4
src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
View file

@ -103,7 +103,7 @@ public class AdminRelatedqueryAction extends FessAdminAction {
RenderDataUtil.register(data, "relatedQueryItems", relatedQueryService.getRelatedQueryList(relatedQueryPager)); // page navi
// restore from pager
copyBeanToBean(relatedQueryPager, form, op -> op.include("id"));
copyBeanToBean(relatedQueryPager, form, op -> op.include("term", "queries"));
}
// ===================================================================================
@ -311,7 +311,7 @@ public class AdminRelatedqueryAction extends FessAdminAction {
RenderDataUtil.register(data, "relatedQueryItems", relatedQueryService.getRelatedQueryList(relatedQueryPager));
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(relatedQueryPager, form, op -> op.include("id"));
copyBeanToBean(relatedQueryPager, form, op -> op.include("term", "queries"));
});
});
}

4
src/main/java/org/codelibs/fess/app/web/admin/relatedquery/SearchForm.java
View file

@ -20,6 +20,8 @@ package org.codelibs.fess.app.web.admin.relatedquery;
*/
public class SearchForm {
public String id;
public String term;
public String queries;
}

6
src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/SearchBody.java
View file

@ -18,5 +18,9 @@ package org.codelibs.fess.app.web.api.admin.relatedquery;
import org.codelibs.fess.app.web.api.admin.BaseSearchBody;
public class SearchBody extends BaseSearchBody {
public String id;
public String term;
public String queries;
}

31
src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
View file

@ -36,6 +36,37 @@
</la:info>
<la:errors />
</div>
<la:form action="/admin/relatedquery/"
styleClass="form-horizontal">
<div class="form-group">
<label for="term" class="col-sm-2 control-label"><la:message
key="labels.related_query_term" /></label>
<div class="col-sm-10">
<la:text styleId="term" property="term" styleClass="form-control" />
</div>
</div>
<div class="form-group">
<label for="queries" class="col-sm-2 control-label"><la:message
key="labels.related_query_queries" /></label>
<div class="col-sm-10">
<la:text styleId="queries" property="queries" styleClass="form-control" />
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary" id="submit"
name="search"
value="<la:message key="labels.crud_button_search" />">
<em class="fa fa-search"></em>
<la:message key="labels.crud_button_search" />
</button>
<button type="submit" class="btn btn-default" name="reset"
value="<la:message key="labels.crud_button_reset" />">
<la:message key="labels.crud_button_reset" />
</button>
</div>
</div>
</la:form>
<%-- List --%>
<c:if test="${relatedQueryPager.allRecordCount == 0}">
<div class="row top10">