Add search option for relatedcontent

src/main/java/org/codelibs/fess/app/pager/RelatedContentPager.java

@@ -44,7 +44,7 @@ public class RelatedContentPager implements Serializable {
 
     public String term;
 
-    public String queries;
+    public String content;
 
     public String createdBy;
 
@@ -62,7 +62,7 @@ public class RelatedContentPager implements Serializable {
 
         id = null;
         term = null;
-        queries = null;
+        content = null;
         createdBy = null;
         createdTime = null;
         versionNo = null;

src/main/java/org/codelibs/fess/app/service/RelatedContentService.java

@@ -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.RelatedContentPager;
 import org.codelibs.fess.es.config.cbean.RelatedContentCB;
@@ -70,8 +71,11 @@ public class RelatedContentService {
     }
 
     protected void setupListCondition(final RelatedContentCB cb, final RelatedContentPager relatedContentPager) {
-        if (relatedContentPager.id != null) {
-            cb.query().docMeta().setId_Equal(relatedContentPager.id);
+        if (StringUtil.isNotBlank(relatedContentPager.term)) {
+            cb.query().setTerm_Wildcard(relatedContentPager.term);
+        }
+        if (StringUtil.isNotBlank(relatedContentPager.content)) {
+            cb.query().setContent_Wildcard(relatedContentPager.content);
         }
         // TODO Long, Integer, String supported only.
 

src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java

@@ -96,7 +96,7 @@ public class AdminRelatedcontentAction extends FessAdminAction {
         RenderDataUtil.register(data, "relatedContentItems", relatedContentService.getRelatedContentList(relatedContentPager)); // page navi
 
         // restore from pager
-        copyBeanToBean(relatedContentPager, form, op -> op.include("id"));
+        copyBeanToBean(relatedContentPager, form, op -> op.include("term", "content"));
     }
 
     // ===================================================================================
@@ -279,7 +279,7 @@ public class AdminRelatedcontentAction extends FessAdminAction {
             RenderDataUtil.register(data, "relatedContentItems", relatedContentService.getRelatedContentList(relatedContentPager));
         }).useForm(SearchForm.class, setup -> {
             setup.setup(form -> {
-                copyBeanToBean(relatedContentPager, form, op -> op.include("id"));
+                copyBeanToBean(relatedContentPager, form, op -> op.include("term", "content"));
             });
         });
     }

src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/SearchForm.java

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

src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/SearchBody.java

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

src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp

@@ -36,6 +36,37 @@
 									</la:info>
 									<la:errors />
 								</div>
+								<la:form action="/admin/relatedcontent/"
+										 styleClass="form-horizontal">
+									<div class="form-group">
+										<label for="term" class="col-sm-2 control-label"><la:message
+												key="labels.related_content_term" /></label>
+										<div class="col-sm-10">
+											<la:text styleId="term" property="term" styleClass="form-control" />
+										</div>
+									</div>
+									<div class="form-group">
+										<label for="content" class="col-sm-2 control-label"><la:message
+												key="labels.related_content_content" /></label>
+										<div class="col-sm-10">
+											<la:text styleId="content" property="content" 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="${relatedContentPager.allRecordCount == 0}">
 									<div class="row top10">