diff --git a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
index 5b3bcd0b0..89c21bfbf 100644
--- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.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.BoostDocPager;
import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
@@ -69,8 +70,11 @@ public class BoostDocumentRuleService {
}
protected void setupListCondition(final BoostDocumentRuleCB cb, final BoostDocPager boostDocumentRulePager) {
- if (boostDocumentRulePager.id != null) {
- cb.query().docMeta().setId_Equal(boostDocumentRulePager.id);
+ if (StringUtil.isNotBlank(boostDocumentRulePager.urlExpr)) {
+ cb.query().setUrlExpr_Wildcard(boostDocumentRulePager.urlExpr);
+ }
+ if (StringUtil.isNotBlank(boostDocumentRulePager.boostExpr)) {
+ cb.query().setBoostExpr_Wildcard(boostDocumentRulePager.boostExpr);
}
// TODO Long, Integer, String supported only.
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
index 69df53ab0..bdb3a2784 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
@@ -96,7 +96,7 @@ public class AdminBoostdocAction extends FessAdminAction {
RenderDataUtil.register(data, "boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager)); // page navi
// restore from pager
- copyBeanToBean(boostDocPager, form, op -> op.include("id"));
+ copyBeanToBean(boostDocPager, form, op -> op.include("urlExpr", "boostExpr"));
}
// ===================================================================================
@@ -279,7 +279,7 @@ public class AdminBoostdocAction extends FessAdminAction {
RenderDataUtil.register(data, "boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager));
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
- copyBeanToBean(boostDocPager, form, op -> op.include("id"));
+ copyBeanToBean(boostDocPager, form, op -> op.include("urlExpr", "boostExpr"));
});
});
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java
index 03c41daa8..5dc52c3c5 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java
@@ -21,6 +21,8 @@ package org.codelibs.fess.app.web.admin.boostdoc;
*/
public class SearchForm {
- public String id;
+ public String urlExpr;
+
+ public String boostExpr;
}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java
index 3fa9498ed..05b68dceb 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.app.web.api.admin.boostdoc;
import org.codelibs.fess.app.web.api.admin.BaseSearchBody;
public class SearchBody extends BaseSearchBody {
- public String id;
+
+ public String urlExpr;
+
+ public String boostExpr;
}
diff --git a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
index 1a47c6c8b..2794fc9a3 100644
--- a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
@@ -36,6 +36,37 @@
+
+
+
+
+
<%-- List --%>