From a1a6ad6ee5397815a9220abc816c46d3fc839e03 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sun, 20 Dec 2015 22:36:47 +0900 Subject: [PATCH] replace with popularWord --- .../java/org/codelibs/fess/api/json/JsonApiManager.java | 6 +++--- .../fess/app/web/admin/general/AdminGeneralAction.java | 4 ++-- .../org/codelibs/fess/app/web/admin/general/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/general/MailForm.java | 2 +- .../java/org/codelibs/fess/mylasta/action/FessLabels.java | 2 +- src/main/resources/fess_label.properties | 2 +- src/main/resources/fess_label_en.properties | 2 +- src/main/resources/fess_label_ja.properties | 2 +- src/main/webapp/WEB-INF/orig/view/index.jsp | 2 +- src/main/webapp/WEB-INF/orig/view/search.jsp | 2 +- .../webapp/WEB-INF/view/admin/general/admin_general.jsp | 6 +++--- src/main/webapp/WEB-INF/view/index.jsp | 2 +- src/main/webapp/WEB-INF/view/search.jsp | 2 +- src/main/webapp/css/style.css | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java index 48e56f6e4c..1122c60a4b 100644 --- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java @@ -327,11 +327,11 @@ protected void processPopularWordRequest(final HttpServletRequest request, final String errMsg = StringUtil.EMPTY; final StringBuilder buf = new StringBuilder(255); try { - final List hotSearchWordList = popularWordHelper.getWordList(seed, tags, fields, excludes); + final List popularWordList = popularWordHelper.getWordList(seed, tags, fields, excludes); buf.append("\"result\":["); boolean first1 = true; - for (final String word : hotSearchWordList) { + for (final String word : popularWordList) { if (!first1) { buf.append(','); } else { @@ -348,7 +348,7 @@ protected void processPopularWordRequest(final HttpServletRequest request, final } errMsg = e.getMessage(); if (logger.isDebugEnabled()) { - logger.debug("Failed to process a hotSearchWord request.", e); + logger.debug("Failed to process a popularWord request.", e); } } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java index 0bfa268590..77d920eb4b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java @@ -148,7 +148,7 @@ public HtmlResponse update(final EditForm form) { updateProperty(Constants.IGNORE_FAILURE_TYPE_PROPERTY, form.ignoreFailureType); updateProperty(Constants.FAILURE_COUNT_THRESHOLD_PROPERTY, form.failureCountThreshold.toString()); updateProperty(Constants.WEB_API_POPULAR_WORD_PROPERTY, - form.hotSearchWord != null && Constants.ON.equalsIgnoreCase(form.hotSearchWord) ? Constants.TRUE : Constants.FALSE); + form.popularWord != null && Constants.ON.equalsIgnoreCase(form.popularWord) ? Constants.TRUE : Constants.FALSE); updateProperty(Constants.CSV_FILE_ENCODING_PROPERTY, form.csvFileEncoding); updateProperty(Constants.PURGE_SEARCH_LOG_DAY_PROPERTY, form.purgeSearchLogDay.toString()); updateProperty(Constants.PURGE_JOB_LOG_DAY_PROPERTY, form.purgeJobLogDay.toString()); @@ -180,7 +180,7 @@ protected void updateForm(final EditForm form) { form.ignoreFailureType = crawlerProperties.getProperty(Constants.IGNORE_FAILURE_TYPE_PROPERTY, Constants.DEFAULT_IGNORE_FAILURE_TYPE); form.failureCountThreshold = getPropertyAsInteger(Constants.FAILURE_COUNT_THRESHOLD_PROPERTY, Constants.DEFAULT_FAILURE_COUNT); - form.hotSearchWord = crawlerProperties.getProperty(Constants.WEB_API_POPULAR_WORD_PROPERTY, Constants.TRUE); + form.popularWord = crawlerProperties.getProperty(Constants.WEB_API_POPULAR_WORD_PROPERTY, Constants.TRUE); form.csvFileEncoding = crawlerProperties.getProperty(Constants.CSV_FILE_ENCODING_PROPERTY, Constants.UTF_8); form.purgeSearchLogDay = Integer.parseInt(crawlerProperties.getProperty(Constants.PURGE_SEARCH_LOG_DAY_PROPERTY, Constants.DEFAULT_PURGE_DAY)); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java index 3f71fc76ae..3ecb39f33c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java @@ -78,7 +78,7 @@ public class EditForm implements Serializable { public Integer failureCountThreshold; @Size(max = 10) - public String hotSearchWord; + public String popularWord; @Required @Size(max = 20) diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java b/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java index d379bad61c..6782a88e67 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java @@ -52,7 +52,7 @@ public class MailForm implements Serializable { public String failureCountThreshold; - public String hotSearchWord; + public String popularWord; public String csvFileEncoding; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index 5b764fd5d6..ccb16b8811 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -213,7 +213,7 @@ public class FessLabels extends ActionMessages { public static final String LABELS_HANDLER_SCRIPT = "{labels.handlerScript}"; /** The key of the message: Popular words */ - public static final String LABELS_HOT_SEARCH_WORD = "{labels.hotSearchWord}"; + public static final String LABELS_POPULAR_WORD = "{labels.popularWord}"; /** The key of the message: Ignored Failure Type */ public static final String LABELS_IGNORE_FAILURE_TYPE = "{labels.ignoreFailureType}"; diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index 7dc076a1d5..5d0aa147a6 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -60,7 +60,7 @@ labels.fileName=File name labels.handlerName=Handler Name labels.handlerParameter=Parameters labels.handlerScript=Scripts -labels.hotSearchWord=Popular words +labels.popularWord=Popular words labels.ignoreFailureType=Ignored Failure Type labels.lastAccessTime=Last Accessed labels.notificationTo=Notification To diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties index 3ab11f5ae8..bf72ea0d51 100644 --- a/src/main/resources/fess_label_en.properties +++ b/src/main/resources/fess_label_en.properties @@ -60,7 +60,7 @@ labels.fileName=File name labels.handlerName=Handler Name labels.handlerParameter=Parameters labels.handlerScript=Scripts -labels.hotSearchWord=Popular words +labels.popularWord=Popular words labels.ignoreFailureType=Ignored Failure Type labels.lastAccessTime=Last Accessed labels.notificationTo=Notification To diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties index 7a5a2d2ece..7b60ac8a87 100644 --- a/src/main/resources/fess_label_ja.properties +++ b/src/main/resources/fess_label_ja.properties @@ -60,7 +60,7 @@ labels.fileName = \u30d5\u30a1\u30a4\u30eb\u540d labels.handlerName = \u30cf\u30f3\u30c9\u30e9\u540d labels.handlerParameter = \u30d1\u30e9\u30e1\u30fc\u30bf labels.handlerScript = \u30b9\u30af\u30ea\u30d7\u30c8 -labels.hotSearchWord = \u4eba\u6c17\u30ef\u30fc\u30c9 +labels.popularWord = \u4eba\u6c17\u30ef\u30fc\u30c9 labels.ignoreFailureType = \u7121\u8996\u3055\u308c\u305f\u969c\u5bb3\u7a2e\u985e labels.lastAccessTime = \u6700\u7d42\u30a2\u30af\u30bb\u30b9\u65e5\u6642 labels.notificationTo = \u901a\u77e5\u5148 diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp index ba6198644c..8e7503df3a 100644 --- a/src/main/webapp/WEB-INF/orig/view/index.jsp +++ b/src/main/webapp/WEB-INF/orig/view/index.jsp @@ -72,7 +72,7 @@
-

+

-

+

-
- +
-
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp index ba6198644c..8e7503df3a 100644 --- a/src/main/webapp/WEB-INF/view/index.jsp +++ b/src/main/webapp/WEB-INF/view/index.jsp @@ -72,7 +72,7 @@
-

+

-

+