Add search option for duplicatehost

src/main/java/org/codelibs/fess/app/service/DuplicateHostService.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.DuplicateHostPager;
 import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
@@ -84,8 +85,11 @@ public class DuplicateHostService {
     }
 
     protected void setupListCondition(final DuplicateHostCB cb, final DuplicateHostPager duplicateHostPager) {
-        if (duplicateHostPager.id != null) {
-            cb.query().docMeta().setId_Equal(duplicateHostPager.id);
+        if (StringUtil.isNotBlank(duplicateHostPager.regularName)) {
+            cb.query().setRegularName_Wildcard(duplicateHostPager.regularName);
+        }
+        if (StringUtil.isNotBlank(duplicateHostPager.duplicateHostName)) {
+            cb.query().setDuplicateHostName_Wildcard(duplicateHostPager.duplicateHostName);
         }
         // TODO Long, Integer, String supported only.
 

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java

@@ -96,7 +96,7 @@ public class AdminDuplicatehostAction extends FessAdminAction {
         RenderDataUtil.register(data, "duplicateHostItems", duplicateHostService.getDuplicateHostList(duplicateHostPager)); // page navi
 
         // restore from pager
-        copyBeanToBean(duplicateHostPager, form, op -> op.include("id"));
+        copyBeanToBean(duplicateHostPager, form, op -> op.include("regularName", "duplicateHostName"));
     }
 
     // ===================================================================================
@@ -278,7 +278,7 @@ public class AdminDuplicatehostAction extends FessAdminAction {
             RenderDataUtil.register(data, "duplicateHostItems", duplicateHostService.getDuplicateHostList(duplicateHostPager)); // page navi
             }).useForm(SearchForm.class, setup -> {
             setup.setup(form -> {
-                copyBeanToBean(duplicateHostPager, form, op -> op.include("id"));
+                copyBeanToBean(duplicateHostPager, form, op -> op.include("regularName", "duplicateHostName"));
             });
         });
     }

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

@@ -21,5 +21,8 @@ package org.codelibs.fess.app.web.admin.duplicatehost;
  */
 public class SearchForm {
 
-    public String id;
+    public String regularName;
+
+    public String duplicateHostName;
+
 }

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

@@ -18,6 +18,9 @@ package org.codelibs.fess.app.web.api.admin.duplicatehost;
 import org.codelibs.fess.app.web.api.admin.BaseSearchBody;
 
 public class SearchBody extends BaseSearchBody {
-    public String id;
+
+    public String regularName;
+
+    public String duplicateHostName;
 
 }

src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp

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