From 000eb1b2e5d571fe3eee9321f4095b66a7a6e59b Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Wed, 7 Mar 2018 06:41:46 +0900
Subject: [PATCH] fix #1544 add virutal_host
---
.../org/codelibs/fess/mylasta/direction/FessConfig.java | 6 +++---
src/main/resources/fess_config.properties | 2 +-
.../view/admin/searchlist/admin_searchlist_edit.jsp | 7 +++++++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index 0bfe3c9fd..68bfd4b20 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -506,7 +506,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. fess_log */
String INDEX_LOG_INDEX = "index.log.index";
- /** The key of the configuration. e.g. lang,role,label,anchor */
+ /** The key of the configuration. e.g. lang,role,label,anchor,virtual_host */
String INDEX_ADMIN_ARRAY_FIELDS = "index.admin.array.fields";
/** The key of the configuration. e.g. expires,created,timestamp,last_modified */
@@ -2782,7 +2782,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'index.admin.array.fields'. <br>
- * The value is, e.g. lang,role,label,anchor <br>
+ * The value is, e.g. lang,role,label,anchor,virtual_host <br>
* comment: doc management
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
@@ -8028,7 +8028,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.INDEX_CONFIG_INDEX, ".fess_config");
defaultMap.put(FessConfig.INDEX_USER_INDEX, ".fess_user");
defaultMap.put(FessConfig.INDEX_LOG_INDEX, "fess_log");
- defaultMap.put(FessConfig.INDEX_ADMIN_ARRAY_FIELDS, "lang,role,label,anchor");
+ defaultMap.put(FessConfig.INDEX_ADMIN_ARRAY_FIELDS, "lang,role,label,anchor,virtual_host");
defaultMap.put(FessConfig.INDEX_ADMIN_DATE_FIELDS, "expires,created,timestamp,last_modified");
defaultMap.put(FessConfig.INDEX_ADMIN_INTEGER_FIELDS, "");
defaultMap.put(FessConfig.INDEX_ADMIN_LONG_FIELDS, "content_length,favorite_count,click_count");
diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties
index 82bcc68d4..caf231181 100644
--- a/src/main/resources/fess_config.properties
+++ b/src/main/resources/fess_config.properties
@@ -261,7 +261,7 @@ index.user.index=.fess_user
index.log.index=fess_log
# doc management
-index.admin.array.fields=lang,role,label,anchor
+index.admin.array.fields=lang,role,label,anchor,virtual_host
index.admin.date.fields=expires,created,timestamp,last_modified
index.admin.integer.fields=
index.admin.long.fields=content_length,favorite_count,click_count
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
index 3a115f3a0..616276806 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
@@ -296,6 +296,13 @@
data-validation-help="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" />
</div>
</div>
+ <div class="form-group">
+ <label for="virtual_host" class="col-sm-3 control-label">virtual_host</label>
+ <div class="col-sm-9">
+ <la:errors property="doc.virtual_host" />
+ <la:textarea property="doc.virtual_host" styleClass="form-control" />
+ </div>
+ </div>
</div>
<!-- /.box-body -->
<div class="box-footer">
--
GitLab