0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modify sort field parsing

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-01-15 23:25:35 +09:00
parent 76f8a38372
commit 9cd6b91399
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/codelibs/fess/helper/QueryHelper.java
View file

@ -416,7 +416,7 @@ public class QueryHelper implements Serializable {
}
SortOrder sortOrder;
if (values.length == 2) {
sortOrder = SortOrder.valueOf(values[1]);
sortOrder = SortOrder.DESC.toString().equalsIgnoreCase(values[1])?SortOrder.DESC:SortOrder.ASC;
if (sortOrder == null) {
throw new InvalidQueryException(messages -> messages.addErrorsInvalidQueryUnsupportedSortOrder(
ActionMessages.GLOBAL_PROPERTY_KEY, values[1]), "Invalid sort order: " + termQuery);
@ -734,7 +734,7 @@ public class QueryHelper implements Serializable {
if (defaultSortBuilders != null) {
StreamUtil.of(defaultSortBuilders).forEach(builder -> list.add(builder));
}
list.add(SortBuilders.fieldSort(fieldName).order(SortOrder.ASC.toString().equalsIgnoreCase(order) ? SortOrder.ASC : SortOrder.DESC));
list.add(SortBuilders.fieldSort(fieldName).order(SortOrder.DESC.toString().equalsIgnoreCase(order) ? SortOrder.DESC : SortOrder.ASC));
defaultSortBuilders = list.toArray(new SortBuilder[list.size()]);
}