hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

use discovery configuration to get correct sort field type for given sort field

Browse Source
This commit is contained in:
nwoodward
2022-11-09 15:53:00 -06:00
parent ccd47b0ddd
commit a152f9baef
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java
View File

@@ -45,6 +45,8 @@ import org.dspace.discovery.SearchUtils;
import org.dspace.discovery.configuration.DiscoveryConfiguration; import org.dspace.discovery.configuration.DiscoveryConfiguration;
import org.dspace.discovery.configuration.DiscoveryConfigurationService; import org.dspace.discovery.configuration.DiscoveryConfigurationService;
import org.dspace.discovery.configuration.DiscoverySearchFilter; import org.dspace.discovery.configuration.DiscoverySearchFilter;
import org.dspace.discovery.configuration.DiscoverySortConfiguration;
import org.dspace.discovery.configuration.DiscoverySortFieldConfiguration;
import org.dspace.discovery.indexobject.IndexableItem; import org.dspace.discovery.indexobject.IndexableItem;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -141,16 +143,34 @@ public class OpenSearchController {
queryArgs.setStart(start); queryArgs.setStart(start);
queryArgs.setMaxResults(count); queryArgs.setMaxResults(count);
queryArgs.setDSpaceObjectFilter(IndexableItem.TYPE); queryArgs.setDSpaceObjectFilter(IndexableItem.TYPE);
if (sort != null) { if (sort != null) {
//this is the default sort so we want to switch this to date accessioned DiscoveryConfiguration discoveryConfiguration =
if (sortDirection != null && sortDirection.equals("DESC")) { searchConfigurationService.getDiscoveryConfiguration("");
queryArgs.setSortField(sort + "_sort", SORT_ORDER.desc); if (discoveryConfiguration != null) {
} else { DiscoverySortConfiguration searchSortConfiguration = discoveryConfiguration.getSearchSortConfiguration();
queryArgs.setSortField(sort + "_sort", SORT_ORDER.asc); if (searchSortConfiguration != null) {
DiscoverySortFieldConfiguration sortFieldConfiguration = searchSortConfiguration
.getSortFieldConfiguration(sort);
if (sortFieldConfiguration != null) {
String sortField = searchService
.toSortFieldIndex(sortFieldConfiguration.getMetadataField(), sortFieldConfiguration.getType());
if (sortDirection != null && sortDirection.equals("DESC")) {
queryArgs.setSortField(sortField, SORT_ORDER.desc);
} else {
queryArgs.setSortField(sortField, SORT_ORDER.asc);
}
} else {
throw new IllegalArgumentException(sort + " is not a valid sort field");
}
}
} }
} else { } else {
// this is the default sort so we want to switch this to date accessioned
queryArgs.setSortField("dc.date.accessioned_dt", SORT_ORDER.desc); queryArgs.setSortField("dc.date.accessioned_dt", SORT_ORDER.desc);
} }
if (dsoObject != null) { if (dsoObject != null) {
container = scopeResolver.resolveScope(context, dsoObject); container = scopeResolver.resolveScope(context, dsoObject);
DiscoveryConfiguration discoveryConfiguration = searchConfigurationService DiscoveryConfiguration discoveryConfiguration = searchConfigurationService