fix sort options

This commit is contained in:
Kaoru FUZITA 2015-12-10 17:55:27 +09:00
parent a558c83194
commit 63a4af374f
19 changed files with 195 additions and 179 deletions

View file

@ -57,6 +57,9 @@ import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.update.UpdateRequestBuilder;
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.sort.SortBuilder;
import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder;
public class SearchService {
@ -101,11 +104,22 @@ public class SearchService {
final int pageStart = params.getStartPosition();
final int pageSize = params.getPageSize();
final String sortField = params.getSort();
final List<Map<String, Object>> documentItems =
fessEsClient.search(
fessConfig.getIndexDocumentIndex(),
fessConfig.getIndexDocumentType(),
searchRequestBuilder -> {
if (StringUtil.isNotBlank(sortField)) {
String[] sort = sortField.split("\\.");
SortBuilder sortBuilder = SortBuilders.fieldSort(sort[0]);
if ("asc".equals(sort[1])) {
sortBuilder.order(SortOrder.ASC);
} else if ("desc".equals(sort[1])) {
sortBuilder.order(SortOrder.DESC);
}
searchRequestBuilder.addSort(sortBuilder);
}
return SearchConditionBuilder.builder(searchRequestBuilder).query(query).offset(pageStart).size(pageSize)
.facetInfo(params.getFacetInfo()).geoInfo(params.getGeoInfo())
.responseFields(queryHelper.getResponseFields()).administrativeAccess(params.isAdministrativeAccess())

View file

@ -69,7 +69,6 @@ public class SearchAction extends FessSearchAction {
@Execute
public HtmlResponse search(final SearchForm form) {
final HtmlResponse response = doSearch(form);
if (viewHelper.isUseSession()) {
LaRequestUtil.getOptionalRequest().ifPresent(request -> {
final HttpSession session = request.getSession(false);
@ -78,7 +77,7 @@ public class SearchAction extends FessSearchAction {
}
});
}
return response;
return doSearch(form);
}
@Execute

View file

@ -252,9 +252,9 @@ public abstract class AbstractFessFileTransformer extends AbstractFessXpathTrans
// filetype
putResultDataBody(dataMap, fessConfig.getIndexFieldFiletype(), fileTypeHelper.get(mimeType));
}
// contentLength
// content_length
putResultDataBody(dataMap, fessConfig.getIndexFieldContentLength(), Long.toString(responseData.getContentLength()));
// lastModified
// last_modified
final Date lastModified = responseData.getLastModified();
if (lastModified != null) {
putResultDataBody(dataMap, fessConfig.getIndexFieldLastModified(), lastModified);

View file

@ -267,9 +267,9 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer {
// filetype
putResultDataBody(dataMap, fessConfig.getIndexFieldFiletype(), fileTypeHelper.get(mimeType));
}
// contentLength
// content_length
putResultDataBody(dataMap, fessConfig.getIndexFieldContentLength(), Long.toString(responseData.getContentLength()));
// lastModified
// last_modified
final Date lastModified = responseData.getLastModified();
if (lastModified != null) {
putResultDataBody(dataMap, fessConfig.getIndexFieldLastModified(), lastModified);

View file

@ -101,8 +101,8 @@ public abstract class AbstractDataStoreImpl implements DataStore {
// site
// url
// anchor
// contentLength
// lastModified
// content_length
// last_modified
// id
storeData(config, callback, paramMap, configScriptMap, defaultDataMap);

View file

@ -570,28 +570,28 @@ public class FessLabels extends ActionMessages {
public static final String LABELS_search_result_sort_created_desc = "{labels.search_result_sort_created_desc}";
/** The key of the message: Size (ascending) */
public static final String LABELS_search_result_sort_contentLength_asc = "{labels.search_result_sort_contentLength_asc}";
public static final String LABELS_search_result_sort_content_length_asc = "{labels.search_result_sort_content_length_asc}";
/** The key of the message: Size (descending) */
public static final String LABELS_search_result_sort_contentLength_desc = "{labels.search_result_sort_contentLength_desc}";
public static final String LABELS_search_result_sort_content_length_desc = "{labels.search_result_sort_content_length_desc}";
/** The key of the message: Last Modified (ascending) */
public static final String LABELS_search_result_sort_lastModified_asc = "{labels.search_result_sort_lastModified_asc}";
public static final String LABELS_search_result_sort_last_modified_asc = "{labels.search_result_sort_last_modified_asc}";
/** The key of the message: Last Modified (descending) */
public static final String LABELS_search_result_sort_lastModified_desc = "{labels.search_result_sort_lastModified_desc}";
public static final String LABELS_search_result_sort_last_modified_desc = "{labels.search_result_sort_last_modified_desc}";
/** The key of the message: Click (ascending) */
public static final String LABELS_search_result_sort_clickCount_asc = "{labels.search_result_sort_clickCount_asc}";
public static final String LABELS_search_result_sort_click_count_asc = "{labels.search_result_sort_click_count_asc}";
/** The key of the message: Click (descending) */
public static final String LABELS_search_result_sort_clickCount_desc = "{labels.search_result_sort_clickCount_desc}";
public static final String LABELS_search_result_sort_click_count_desc = "{labels.search_result_sort_click_count_desc}";
/** The key of the message: Favorite (ascending) */
public static final String LABELS_search_result_sort_favoriteCount_asc = "{labels.search_result_sort_favoriteCount_asc}";
public static final String LABELS_search_result_sort_favorite_count_asc = "{labels.search_result_sort_favorite_count_asc}";
/** The key of the message: Favorite (descending) */
public static final String LABELS_search_result_sort_favoriteCount_desc = "{labels.search_result_sort_favoriteCount_desc}";
public static final String LABELS_search_result_sort_favorite_count_desc = "{labels.search_result_sort_favorite_count_desc}";
/** The key of the message: {0} bytes */
public static final String LABELS_search_result_size = "{labels.search_result_size}";
@ -989,6 +989,9 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Suggest by Search Words */
public static final String LABELS_suggest_search_log_enabled = "{labels.suggest_search_log_enabled}";
/** The key of the message: Suggest by Documents */
public static final String LABELS_suggest_documents_enabled = "{labels.suggest_documents_enabled}";
/** The key of the message: Purge Suggest Documents Before */
public static final String LABELS_purge_suggest_search_log_day = "{labels.purge_suggest_search_log_day}";

View file

@ -182,14 +182,14 @@ labels.search_result_select_sort=-- Sort --
labels.search_result_select_num=-- Results per page --
labels.search_result_sort_created_asc=Date (ascending)
labels.search_result_sort_created_desc=Date (descending)
labels.search_result_sort_contentLength_asc=Size (ascending)
labels.search_result_sort_contentLength_desc=Size (descending)
labels.search_result_sort_lastModified_asc=Last Modified (ascending)
labels.search_result_sort_lastModified_desc=Last Modified (descending)
labels.search_result_sort_clickCount_asc=Click (ascending)
labels.search_result_sort_clickCount_desc=Click (descending)
labels.search_result_sort_favoriteCount_asc=Favorite (ascending)
labels.search_result_sort_favoriteCount_desc=Favorite (descending)
labels.search_result_sort_content_length_asc=Size (ascending)
labels.search_result_sort_content_length_desc=Size (descending)
labels.search_result_sort_last_modified_asc=Last Modified (ascending)
labels.search_result_sort_last_modified_desc=Last Modified (descending)
labels.search_result_sort_click_count_asc=Click (ascending)
labels.search_result_sort_click_count_desc=Click (descending)
labels.search_result_sort_favorite_count_asc=Favorite (ascending)
labels.search_result_sort_favorite_count_desc=Favorite (descending)
labels.search_result_size={0} bytes
labels.search_result_created=Registered:
labels.search_result_last_modified=Last Modified:

View file

@ -182,14 +182,14 @@ labels.search_result_select_sort=-- Sort --
labels.search_result_select_num=-- Results per page --
labels.search_result_sort_created_asc=Date (ascending)
labels.search_result_sort_created_desc=Date (descending)
labels.search_result_sort_contentLength_asc=Size (ascending)
labels.search_result_sort_contentLength_desc=Size (descending)
labels.search_result_sort_lastModified_asc=Last Modified (ascending)
labels.search_result_sort_lastModified_desc=Last Modified (descending)
labels.search_result_sort_clickCount_asc=Click (ascending)
labels.search_result_sort_clickCount_desc=Click (descending)
labels.search_result_sort_favoriteCount_asc=Favorite (ascending)
labels.search_result_sort_favoriteCount_desc=Favorite (descending)
labels.search_result_sort_content_length_asc=Size (ascending)
labels.search_result_sort_content_length_desc=Size (descending)
labels.search_result_sort_last_modified_asc=Last Modified (ascending)
labels.search_result_sort_last_modified_desc=Last Modified (descending)
labels.search_result_sort_click_count_asc=Click (ascending)
labels.search_result_sort_click_count_desc=Click (descending)
labels.search_result_sort_favorite_count_asc=Favorite (ascending)
labels.search_result_sort_favorite_count_desc=Favorite (descending)
labels.search_result_size={0} bytes
labels.search_result_created=Registered:
labels.search_result_last_modified=Last Modified:

View file

@ -181,14 +181,14 @@ labels.search_result_select_sort = - \u30bd\u30fc\u30c8 -
labels.search_result_select_num = - \u8868\u793a\u4ef6\u6570 -
labels.search_result_sort_created_asc = \u65e5\u4ed8 (\u6607\u9806)
labels.search_result_sort_created_desc = \u65e5\u4ed8 (\u964d\u9806)
labels.search_result_sort_contentLength_asc = \u30b5\u30a4\u30ba (\u6607\u9806)
labels.search_result_sort_contentLength_desc = \u30b5\u30a4\u30ba (\u964d\u9806)
labels.search_result_sort_lastModified_asc = \u6700\u7d42\u66f4\u65b0\u65e5\u6642 (\u6607\u9806)
labels.search_result_sort_lastModified_desc = \u6700\u7d42\u66f4\u65b0\u65e5\u6642 (\u964d\u9806)
labels.search_result_sort_clickCount_asc = \u30af\u30ea\u30c3\u30af\u6570 (\u6607\u9806)
labels.search_result_sort_clickCount_desc = \u30af\u30ea\u30c3\u30af\u6570 (\u964d\u9806)
labels.search_result_sort_favoriteCount_asc = \u304a\u6c17\u306b\u5165\u308a\u6570 (\u6607\u9806)
labels.search_result_sort_favoriteCount_desc = \u304a\u6c17\u306b\u5165\u308a\u6570 (\u964d\u9806)
labels.search_result_sort_content_length_asc = \u30b5\u30a4\u30ba (\u6607\u9806)
labels.search_result_sort_content_length_desc = \u30b5\u30a4\u30ba (\u964d\u9806)
labels.search_result_sort_last_modified_asc = \u6700\u7d42\u66f4\u65b0\u65e5\u6642 (\u6607\u9806)
labels.search_result_sort_last_modified_desc = \u6700\u7d42\u66f4\u65b0\u65e5\u6642 (\u964d\u9806)
labels.search_result_sort_click_count_asc = \u30af\u30ea\u30c3\u30af\u6570 (\u6607\u9806)
labels.search_result_sort_click_count_desc = \u30af\u30ea\u30c3\u30af\u6570 (\u964d\u9806)
labels.search_result_sort_favorite_count_asc = \u304a\u6c17\u306b\u5165\u308a\u6570 (\u6607\u9806)
labels.search_result_sort_favorite_count_desc = \u304a\u6c17\u306b\u5165\u308a\u6570 (\u964d\u9806)
labels.search_result_size = {0} \u30d0\u30a4\u30c8
labels.search_result_created = \u767b\u9332\u65e5\u6642:
labels.search_result_last_modified = \u6700\u7d42\u66f4\u65b0\u65e5\u6642:

View file

@ -55,32 +55,32 @@ ${fe:facetForm()}${fe:geoForm()}
<la:option value="created.desc">
<la:message key="labels.search_result_sort_created_desc" />
</la:option>
<la:option value="contentLength.asc">
<la:message key="labels.search_result_sort_contentLength_asc" />
<la:option value="content_length.asc">
<la:message key="labels.search_result_sort_content_length_asc" />
</la:option>
<la:option value="contentLength.desc">
<la:message key="labels.search_result_sort_contentLength_desc" />
<la:option value="content_length.desc">
<la:message key="labels.search_result_sort_content_length_desc" />
</la:option>
<la:option value="lastModified.asc">
<la:message key="labels.search_result_sort_lastModified_asc" />
<la:option value="last_modified.asc">
<la:message key="labels.search_result_sort_last_modified_asc" />
</la:option>
<la:option value="lastModified.desc">
<la:message key="labels.search_result_sort_lastModified_desc" />
<la:option value="last_modified.desc">
<la:message key="labels.search_result_sort_last_modified_desc" />
</la:option>
<c:if test="${searchLogSupport}">
<la:option value="clickCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_clickCount_asc" />
<la:option value="click_count.asc">
<la:message key="labels.search_result_sort_click_count_asc" />
</la:option>
<la:option value="clickCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_clickCount_desc" />
<la:option value="click_count.desc">
<la:message key="labels.search_result_sort_click_count_desc" />
</la:option>
</c:if>
<c:if test="${favoriteSupport}">
<la:option value="favoriteCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_favoriteCount_asc" />
<la:option value="favorite_count.asc">
<la:message key="labels.search_result_sort_favorite_count_asc" />
</la:option>
<la:option value="favoriteCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_favoriteCount_desc" />
<la:option value="favorite_count.desc">
<la:message key="labels.search_result_sort_favorite_count_desc" />
</la:option>
</c:if>
</la:select>

View file

@ -90,32 +90,32 @@ ${fe:facetForm()}${fe:geoForm()}
<la:option value="created.desc">
<la:message key="labels.search_result_sort_created_desc" />
</la:option>
<la:option value="contentLength.asc">
<la:message key="labels.search_result_sort_contentLength_asc" />
<la:option value="content_length.asc">
<la:message key="labels.search_result_sort_content_length_asc" />
</la:option>
<la:option value="contentLength.desc">
<la:message key="labels.search_result_sort_contentLength_desc" />
<la:option value="content_length.desc">
<la:message key="labels.search_result_sort_content_length_desc" />
</la:option>
<la:option value="lastModified.asc">
<la:message key="labels.search_result_sort_lastModified_asc" />
<la:option value="last_modified.asc">
<la:message key="labels.search_result_sort_last_modified_asc" />
</la:option>
<la:option value="lastModified.desc">
<la:message key="labels.search_result_sort_lastModified_desc" />
<la:option value="last_modified.desc">
<la:message key="labels.search_result_sort_last_modified_desc" />
</la:option>
<c:if test="${searchLogSupport}">
<la:option value="clickCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_clickCount_asc" />
<la:option value="click_count.asc">
<la:message key="labels.search_result_sort_click_count_asc" />
</la:option>
<la:option value="clickCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_clickCount_desc" />
<la:option value="click_count.desc">
<la:message key="labels.search_result_sort_click_count_desc" />
</la:option>
</c:if>
<c:if test="${favoriteSupport}">
<la:option value="favoriteCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_favoriteCount_asc" />
<la:option value="favorite_count.asc">
<la:message key="labels.search_result_sort_favorite_count_asc" />
</la:option>
<la:option value="favoriteCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_favoriteCount_desc" />
<la:option value="favorite_count.desc">
<la:message key="labels.search_result_sort_favorite_count_desc" />
</la:option>
</c:if>
</la:select>

View file

@ -139,37 +139,37 @@
<la:option value="created.desc">
<la:message key="labels.search_result_sort_created_desc" />
</la:option>
<la:option value="contentLength.asc">
<la:option value="content_length.asc">
<la:message
key="labels.search_result_sort_contentLength_asc" />
key="labels.search_result_sort_content_length_asc" />
</la:option>
<la:option value="contentLength.desc">
<la:option value="content_length.desc">
<la:message
key="labels.search_result_sort_contentLength_desc" />
key="labels.search_result_sort_content_length_desc" />
</la:option>
<la:option value="lastModified.asc">
<la:message key="labels.search_result_sort_lastModified_asc" />
<la:option value="last_modified.asc">
<la:message key="labels.search_result_sort_last_modified_asc" />
</la:option>
<la:option value="lastModified.desc">
<la:option value="last_modified.desc">
<la:message
key="labels.search_result_sort_lastModified_desc" />
key="labels.search_result_sort_last_modified_desc" />
</la:option>
<c:if test="${searchLogSupport}">
<la:option value="clickCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_clickCount_asc" />
<la:option value="click_count.asc">
<la:message key="labels.search_result_sort_click_count_asc" />
</la:option>
<la:option value="clickCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_clickCount_desc" />
<la:option value="click_count.desc">
<la:message key="labels.search_result_sort_click_count_desc" />
</la:option>
</c:if>
<c:if test="${favoriteSupport}">
<la:option value="favoriteCount_l_x_dv.asc">
<la:option value="favorite_count.asc">
<la:message
key="labels.search_result_sort_favoriteCount_asc" />
key="labels.search_result_sort_favorite_count_asc" />
</la:option>
<la:option value="favoriteCount_l_x_dv.desc">
<la:option value="favorite_count.desc">
<la:message
key="labels.search_result_sort_favoriteCount_desc" />
key="labels.search_result_sort_favorite_count_desc" />
</la:option>
</c:if>
</la:select>

View file

@ -32,22 +32,22 @@
<la:message key="labels.search_result_sort_created_asc" />
</c:if> <c:if test="${sort=='created.desc'}">
<la:message key="labels.search_result_sort_created_desc" />
</c:if> <c:if test="${sort=='contentLength.asc'}">
<la:message key="labels.search_result_sort_contentLength_asc" />
</c:if> <c:if test="${sort=='contentLength.desc'}">
<la:message key="labels.search_result_sort_contentLength_desc" />
</c:if> <c:if test="${sort=='lastModified.asc'}">
<la:message key="labels.search_result_sort_lastModified_asc" />
</c:if> <c:if test="${sort=='lastModified.desc'}">
<la:message key="labels.search_result_sort_lastModified_desc" />
</c:if> <c:if test="${sort=='clickCount_l_x_dv.asc'}">
<la:message key="labels.search_result_sort_clickCount_asc" />
</c:if> <c:if test="${sort=='clickCount_l_x_dv.desc'}">
<la:message key="labels.search_result_sort_clickCount_desc" />
</c:if> <c:if test="${sort=='favoriteCount_l_x_dv.asc'}">
<la:message key="labels.search_result_sort_favoriteCount_asc" />
</c:if> <c:if test="${sort=='favoriteCount_l_x_dv.desc'}">
<la:message key="labels.search_result_sort_favoriteCount_desc" />
</c:if> <c:if test="${sort=='content_length.asc'}">
<la:message key="labels.search_result_sort_content_length_asc" />
</c:if> <c:if test="${sort=='content_length.desc'}">
<la:message key="labels.search_result_sort_content_length_desc" />
</c:if> <c:if test="${sort=='last_modified.asc'}">
<la:message key="labels.search_result_sort_last_modified_asc" />
</c:if> <c:if test="${sort=='last_modified.desc'}">
<la:message key="labels.search_result_sort_last_modified_desc" />
</c:if> <c:if test="${sort=='click_count.asc'}">
<la:message key="labels.search_result_sort_click_count_asc" />
</c:if> <c:if test="${sort=='click_count.desc'}">
<la:message key="labels.search_result_sort_click_count_desc" />
</c:if> <c:if test="${sort=='favorite_count.asc'}">
<la:message key="labels.search_result_sort_favorite_count_asc" />
</c:if> <c:if test="${sort=='favorite_count.desc'}">
<la:message key="labels.search_result_sort_favorite_count_desc" />
</c:if>
</a></li>
<li><la:message key="labels.searchoptions_menu_num" /> <a

View file

@ -8,7 +8,7 @@
documents which has "Fess" as the document title, you can enter:
<pre>title:Fess</pre>
The available fields are "url", "host", "site", "title", "content",
"contentLength", "lastModified" and "mimetype", and they are
"content_length", "last_modified" and "mimetype", and they are
customizable.
</dd>
<dt>Sort</dt>
@ -17,9 +17,9 @@
"sort:&lt;field&gt;.&lt;order&gt;", where &lt;order&gt; is asc or
desc. If you want to find documents which has "Fess" and sort them in
descending order, you can enter:
<pre>Fess sort:contentLength.desc</pre>
The available sort field are "created", "contentLength" and
"lastModified", and they are customizable.
<pre>Fess sort:content_length.desc</pre>
The available sort field are "created", "content_length" and
"last_modified", and they are customizable.
</dd>
<dt>AND</dt>
<dd>
@ -49,9 +49,9 @@
Range Queries allow one to match documents whose field(s) values are
between the lower and upper bound specified by the Range Query. Range
Queries can be inclusive or exclusive of the upper and lower bounds.
If you want to find documents whose contentLength fields have values
If you want to find documents whose content_length fields have values
between 1000 and 10000, inclusive, you can enter:
<pre>contentLength:[1000 TO 10000]</pre>
<pre>content_length:[1000 TO 10000]</pre>
If you want to exclude the upper and lower bounds, use "{}".
</dd>
<dt>Boost</dt>

View file

@ -7,7 +7,7 @@
たとえば、ドキュメントの title フィールドで Fess を含むドキュメントを検索する場合は次のように入力します。
<pre>title:Fess</pre>
標準で利用可能なフィールドは url, host, site, title, content,
contentLength, lastModified および mimetype になります。
content_length, last_modified および mimetype になります。
設定で指定するフィールドは変更することができます。
</dd>
<dt>ソート</dt>
@ -16,8 +16,8 @@
sort 演算子の利用方法は sort:&lt;field&gt;.&lt;order&gt; になります。
&lt;order&gt; は asc または desc で昇順・降順を指定できます。
たとえば、Fess を含むドキュメントでサイズの降順にソートしたい場合、次のように入力します。
<pre>Fess sort:contentLength.desc</pre>
標準で利用可能なフィールドは created, contentLength および lastModified になります。
<pre>Fess sort:content_length.desc</pre>
標準で利用可能なフィールドは created, content_length および last_modified になります。
設定で指定するフィールドは変更することができます。
</dd>
<dt>AND検索</dt>
@ -47,8 +47,8 @@
<dd>
範囲検索はフィールド値の範囲を指定することでその条件にマッチするドキュメントを検索します。
範囲の境界値を含める場合は [] を利用して、含めない場合は {} を利用します。
たとえば、contentLength フィールドが 1000 から 10000 の値を持つドキュメントを検索する場合は次のように入力します。
<pre>contentLength:[1000 TO 10000]</pre>
たとえば、content_length フィールドが 1000 から 10000 の値を持つドキュメントを検索する場合は次のように入力します。
<pre>content_length:[1000 TO 10000]</pre>
</dd>
<dt>ブースト検索</dt>
<dd>

View file

@ -64,32 +64,32 @@ ${fe:facetForm()}${fe:geoForm()}
<la:option value="created.desc">
<la:message key="labels.search_result_sort_created_desc" />
</la:option>
<la:option value="contentLength.asc">
<la:message key="labels.search_result_sort_contentLength_asc" />
<la:option value="content_length.asc">
<la:message key="labels.search_result_sort_content_length_asc" />
</la:option>
<la:option value="contentLength.desc">
<la:message key="labels.search_result_sort_contentLength_desc" />
<la:option value="content_length.desc">
<la:message key="labels.search_result_sort_content_length_desc" />
</la:option>
<la:option value="lastModified.asc">
<la:message key="labels.search_result_sort_lastModified_asc" />
<la:option value="last_modified.asc">
<la:message key="labels.search_result_sort_last_modified_asc" />
</la:option>
<la:option value="lastModified.desc">
<la:message key="labels.search_result_sort_lastModified_desc" />
<la:option value="last_modified.desc">
<la:message key="labels.search_result_sort_last_modified_desc" />
</la:option>
<c:if test="${searchLogSupport}">
<la:option value="clickCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_clickCount_asc" />
<la:option value="click_count.asc">
<la:message key="labels.search_result_sort_click_count_asc" />
</la:option>
<la:option value="clickCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_clickCount_desc" />
<la:option value="click_count.desc">
<la:message key="labels.search_result_sort_click_count_desc" />
</la:option>
</c:if>
<c:if test="${favoriteSupport}">
<la:option value="favoriteCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_favoriteCount_asc" />
<la:option value="favorite_count.asc">
<la:message key="labels.search_result_sort_favorite_count_asc" />
</la:option>
<la:option value="favoriteCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_favoriteCount_desc" />
<la:option value="favorite_count.desc">
<la:message key="labels.search_result_sort_favorite_count_desc" />
</la:option>
</c:if>
</la:select>

View file

@ -79,32 +79,32 @@ ${fe:facetForm()}${fe:geoForm()}
<la:option value="created.desc">
<la:message key="labels.search_result_sort_created_desc" />
</la:option>
<la:option value="contentLength.asc">
<la:message key="labels.search_result_sort_contentLength_asc" />
<la:option value="content_length.asc">
<la:message key="labels.search_result_sort_content_length_asc" />
</la:option>
<la:option value="contentLength.desc">
<la:message key="labels.search_result_sort_contentLength_desc" />
<la:option value="content_length.desc">
<la:message key="labels.search_result_sort_content_length_desc" />
</la:option>
<la:option value="lastModified.asc">
<la:message key="labels.search_result_sort_lastModified_asc" />
<la:option value="last_modified.asc">
<la:message key="labels.search_result_sort_last_modified_asc" />
</la:option>
<la:option value="lastModified.desc">
<la:message key="labels.search_result_sort_lastModified_desc" />
<la:option value="last_modified.desc">
<la:message key="labels.search_result_sort_last_modified_desc" />
</la:option>
<c:if test="${searchLogSupport}">
<la:option value="clickCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_clickCount_asc" />
<la:option value="click_count.asc">
<la:message key="labels.search_result_sort_click_count_asc" />
</la:option>
<la:option value="clickCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_clickCount_desc" />
<la:option value="click_count.desc">
<la:message key="labels.search_result_sort_click_count_desc" />
</la:option>
</c:if>
<c:if test="${favoriteSupport}">
<la:option value="favoriteCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_favoriteCount_asc" />
<la:option value="favorite_count.asc">
<la:message key="labels.search_result_sort_favorite_count_asc" />
</la:option>
<la:option value="favoriteCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_favoriteCount_desc" />
<la:option value="favorite_count.desc">
<la:message key="labels.search_result_sort_favorite_count_desc" />
</la:option>
</c:if>
</la:select>

View file

@ -139,37 +139,37 @@
<la:option value="created.desc">
<la:message key="labels.search_result_sort_created_desc" />
</la:option>
<la:option value="contentLength.asc">
<la:option value="content_length.asc">
<la:message
key="labels.search_result_sort_contentLength_asc" />
key="labels.search_result_sort_content_length_asc" />
</la:option>
<la:option value="contentLength.desc">
<la:option value="content_length.desc">
<la:message
key="labels.search_result_sort_contentLength_desc" />
key="labels.search_result_sort_content_length_desc" />
</la:option>
<la:option value="lastModified.asc">
<la:message key="labels.search_result_sort_lastModified_asc" />
<la:option value="last_modified.asc">
<la:message key="labels.search_result_sort_last_modified_asc" />
</la:option>
<la:option value="lastModified.desc">
<la:option value="last_modified.desc">
<la:message
key="labels.search_result_sort_lastModified_desc" />
key="labels.search_result_sort_last_modified_desc" />
</la:option>
<c:if test="${searchLogSupport}">
<la:option value="clickCount_l_x_dv.asc">
<la:message key="labels.search_result_sort_clickCount_asc" />
<la:option value="click_count.asc">
<la:message key="labels.search_result_sort_click_count_asc" />
</la:option>
<la:option value="clickCount_l_x_dv.desc">
<la:message key="labels.search_result_sort_clickCount_desc" />
<la:option value="click_count.desc">
<la:message key="labels.search_result_sort_click_count_desc" />
</la:option>
</c:if>
<c:if test="${favoriteSupport}">
<la:option value="favoriteCount_l_x_dv.asc">
<la:option value="favorite_count.asc">
<la:message
key="labels.search_result_sort_favoriteCount_asc" />
key="labels.search_result_sort_favorite_count_asc" />
</la:option>
<la:option value="favoriteCount_l_x_dv.desc">
<la:option value="favorite_count.desc">
<la:message
key="labels.search_result_sort_favoriteCount_desc" />
key="labels.search_result_sort_favorite_count_desc" />
</la:option>
</c:if>
</la:select>

View file

@ -32,22 +32,22 @@
<la:message key="labels.search_result_sort_created_asc" />
</c:if> <c:if test="${sort=='created.desc'}">
<la:message key="labels.search_result_sort_created_desc" />
</c:if> <c:if test="${sort=='contentLength.asc'}">
<la:message key="labels.search_result_sort_contentLength_asc" />
</c:if> <c:if test="${sort=='contentLength.desc'}">
<la:message key="labels.search_result_sort_contentLength_desc" />
</c:if> <c:if test="${sort=='lastModified.asc'}">
<la:message key="labels.search_result_sort_lastModified_asc" />
</c:if> <c:if test="${sort=='lastModified.desc'}">
<la:message key="labels.search_result_sort_lastModified_desc" />
</c:if> <c:if test="${sort=='clickCount_l_x_dv.asc'}">
<la:message key="labels.search_result_sort_clickCount_asc" />
</c:if> <c:if test="${sort=='clickCount_l_x_dv.desc'}">
<la:message key="labels.search_result_sort_clickCount_desc" />
</c:if> <c:if test="${sort=='favoriteCount_l_x_dv.asc'}">
<la:message key="labels.search_result_sort_favoriteCount_asc" />
</c:if> <c:if test="${sort=='favoriteCount_l_x_dv.desc'}">
<la:message key="labels.search_result_sort_favoriteCount_desc" />
</c:if> <c:if test="${sort=='content_length.asc'}">
<la:message key="labels.search_result_sort_content_length_asc" />
</c:if> <c:if test="${sort=='content_length.desc'}">
<la:message key="labels.search_result_sort_content_length_desc" />
</c:if> <c:if test="${sort=='last_modified.asc'}">
<la:message key="labels.search_result_sort_last_modified_asc" />
</c:if> <c:if test="${sort=='last_modified.desc'}">
<la:message key="labels.search_result_sort_last_modified_desc" />
</c:if> <c:if test="${sort=='click_count.asc'}">
<la:message key="labels.search_result_sort_click_count_asc" />
</c:if> <c:if test="${sort=='click_count.desc'}">
<la:message key="labels.search_result_sort_click_count_desc" />
</c:if> <c:if test="${sort=='favorite_count.asc'}">
<la:message key="labels.search_result_sort_favorite_count_asc" />
</c:if> <c:if test="${sort=='favorite_count.desc'}">
<la:message key="labels.search_result_sort_favorite_count_desc" />
</c:if>
</a></li>
<li><la:message key="labels.searchoptions_menu_num" /> <a