#405

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -620,6 +620,9 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Favorite (descending) */
     public static final String LABELS_search_result_sort_favorite_count_desc = "{labels.search_result_sort_favorite_count_desc}";
 
+    /** The key of the message: Multiple */
+    public static final String LABELS_search_result_sort_multiple = "{labels.search_result_sort_multiple}";
+
     /** The key of the message: {0} bytes */
     public static final String LABELS_search_result_size = "{labels.search_result_size}";
 

src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java

@@ -17,8 +17,10 @@ package org.codelibs.fess.mylasta.direction;
 
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -112,15 +114,16 @@ public interface FessProp {
             if (StringUtil.isBlank(value)) {
                 map = Collections.emptyMap();
             } else {
+                final Set<String> keySet = new HashSet<>();
                 map = StreamUtil.of(value.split("\n")).filter(s -> StringUtil.isNotBlank(s)).map(s -> {
                     final String[] pair = s.split("=");
                     if (pair.length == 1) {
                         return new Pair<>(StringUtil.EMPTY, pair[0].trim());
                     } else if (pair.length == 2) {
-                        return new Pair<>(pair[1].trim(), pair[0].trim());
+                        return new Pair<>(pair[0].trim(), pair[1].trim());
                     }
                     return null;
-                }).filter(o -> o != null).collect(Collectors.toMap(Pair::getFirst, d -> d.getSecond()));
+                }).filter(o -> o != null && keySet.add(o.getFirst())).collect(Collectors.toMap(Pair::getFirst, d -> d.getSecond()));
             }
             propMap.put(DEFAULT_SORT_VALUES, map);
         }
@@ -158,15 +161,16 @@ public interface FessProp {
             if (StringUtil.isBlank(value)) {
                 map = Collections.emptyMap();
             } else {
+                final Set<String> keySet = new HashSet<>();
                 map = StreamUtil.of(value.split("\n")).filter(s -> StringUtil.isNotBlank(s)).map(s -> {
                     final String[] pair = s.split("=");
                     if (pair.length == 1) {
                         return new Pair<>(StringUtil.EMPTY, pair[0].trim());
                     } else if (pair.length == 2) {
-                        return new Pair<>(pair[1].trim(), pair[0].trim());
+                        return new Pair<>(pair[0].trim(), pair[1].trim());
                     }
                     return null;
-                }).filter(o -> o != null).collect(Collectors.toMap(Pair::getFirst, d -> d.getSecond()));
+                }).filter(o -> o != null && keySet.add(o.getFirst())).collect(Collectors.toMap(Pair::getFirst, d -> d.getSecond()));
             }
             propMap.put(DEFAULT_LABEL_VALUES, map);
         }

src/main/resources/fess_label.properties

@@ -200,6 +200,7 @@ 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_sort_multiple=Multiple
 labels.search_result_size={0} bytes
 labels.search_result_created=Registered: 
 labels.search_result_last_modified=Last Modified: 

src/main/resources/fess_label_en.properties

@@ -200,6 +200,7 @@ 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_sort_multiple=Multiple
 labels.search_result_size={0} bytes
 labels.search_result_created=Registered: 
 labels.search_result_last_modified=Last Modified: 

src/main/resources/fess_label_ja.properties

@@ -195,6 +195,7 @@ labels.search_result_sort_click_count_asc = \u30af\u30ea\u30c3\u30af\u6570 (\u66
 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_sort_multiple=\u8907\u6570
 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:

src/main/webapp/WEB-INF/orig/view/search.jsp

@@ -28,6 +28,8 @@
 						href="#searchOptions" class="label label-primary"
 						data-toggle="control-options"> <c:if test="${empty sort}">
 								<la:message key="labels.searchoptions_score" />
+							</c:if> <c:if test="${sort=='score.desc'}">
+								<la:message key="labels.searchoptions_score" />
 							</c:if> <c:if test="${sort=='created.asc'}">
 								<la:message key="labels.search_result_sort_created_asc" />
 							</c:if> <c:if test="${sort=='created.desc'}">
@@ -48,6 +50,8 @@
 								<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> <c:if test="${sort.indexOf(',') >= 0}">
+								<la:message key="labels.search_result_sort_multiple" />
 							</c:if>
 					</a></li>
 					<li><la:message key="labels.searchoptions_menu_num" /> <a

src/main/webapp/WEB-INF/view/search.jsp

@@ -50,6 +50,8 @@
 								<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> <c:if test="${sort.indexOf(',') >= 0}">
+								<la:message key="labels.search_result_sort_multiple" />
 							</c:if>
 					</a></li>
 					<li><la:message key="labels.searchoptions_menu_num" /> <a