Skip to content

Commit

Permalink
replace with popularWord
Browse files Browse the repository at this point in the history
  • Loading branch information
@marevol
marevol committed Dec 20, 2015
1 parent ef95d85 commit a1a6ad6
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,11 @@ protected void processPopularWordRequest(final HttpServletRequest request, final
String errMsg = StringUtil.EMPTY;
final StringBuilder buf = new StringBuilder(255);
try {
final List<String> hotSearchWordList = popularWordHelper.getWordList(seed, tags, fields, excludes);
final List<String> 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 {
Expand All @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class MailForm implements Serializable {

public String failureCountThreshold;

public String hotSearchWord;
public String popularWord;

public String csvFileEncoding;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fess_label.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fess_label_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fess_label_ja.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/orig/view/index.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</div>
<c:if test="${!empty popularWords}">
<div>
<p class="hotSearchWordBody ellipsis">
<p class="popularWordBody ellipsis">
<la:message key="labels.search_popular_word_word" />
<c:forEach var="item" items="${popularWords}">
<la:link
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/orig/view/search.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<c:if test="${!empty popularWords}">
<div class="row">
<div class="col-md-12">
<p class="hotSearchWordBody ellipsis">
<p class="popularWordBody ellipsis">
<la:message key="labels.search_popular_word_word" />
<c:forEach var="item" items="${popularWords}">
<la:link
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@
</div>
</div>
<div class="form-group">
<label for="hotSearchWord" class="col-sm-3 control-label"><la:message
<label for="popularWord" class="col-sm-3 control-label"><la:message
key="labels.popular_word_word_enabled" /></label>
<div class="col-sm-9">
<la:errors property="hotSearchWord" />
<la:errors property="popularWord" />
<div class="checkbox">
<label> <la:checkbox property="hotSearchWord" /> <la:message
<label> <la:checkbox property="popularWord" /> <la:message
key="labels.enabled" />
</label>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/view/index.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</div>
<c:if test="${!empty popularWords}">
<div>
<p class="hotSearchWordBody ellipsis">
<p class="popularWordBody ellipsis">
<la:message key="labels.search_popular_word_word" />
<c:forEach var="item" items="${popularWords}">
<la:link
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/view/search.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<c:if test="${!empty popularWords}">
<div class="row">
<div class="col-md-12">
<p class="hotSearchWordBody ellipsis">
<p class="popularWordBody ellipsis">
<la:message key="labels.search_popular_word_word" />
<c:forEach var="item" items="${popularWords}">
<la:link
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ body.search #searchOptions.active, body.help #searchOptions.active {
#result ol {
margin-left: 0;
}
.hotSearchWordBody {
.popularWordBody {
width: 440px;
}
#result .site {
Expand Down Expand Up @@ -291,7 +291,7 @@ body.search #searchOptions.active, body.help #searchOptions.active {
.searchFormBox {
margin-top: 80px;
}
.hotSearchWordBody {
.popularWordBody {
width: 280px;
}
#result .site {
Expand Down

0 comments on commit a1a6ad6

Please sign in to comment.