diff --git a/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java b/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java index 879ba13d07..b27dd3d2a3 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java +++ b/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java @@ -30,8 +30,6 @@ public class DiscoverResult { private int start; private List indexableObjects; private Map> facetResults; - private Map> facetQueryResults; - private Map> facetFieldResults; /** * A map that contains all the documents sougth after, the key is a string representation of the Indexable Object @@ -45,8 +43,6 @@ public class DiscoverResult { public DiscoverResult() { indexableObjects = new ArrayList(); facetResults = new LinkedHashMap>(); - facetQueryResults = new LinkedHashMap>(); - facetFieldResults = new LinkedHashMap>(); searchDocuments = new LinkedHashMap>(); highlightedResults = new HashMap(); } @@ -104,40 +100,6 @@ public class DiscoverResult { return facetResults; } - public List getFacetQueryResult(String facet) { - return facetQueryResults.get(facet) == null ? new ArrayList() : facetQueryResults.get(facet); - } - - public void addFacetQueryResult(String facetField, FacetResult... facetResults) { - List facetValues = this.facetQueryResults.get(facetField); - if (facetValues == null) { - facetValues = new ArrayList(); - } - facetValues.addAll(Arrays.asList(facetResults)); - this.facetQueryResults.put(facetField, facetValues); - } - - public Map> getFacetQueryResults() { - return facetQueryResults; - } - - public List getFacetFieldResult(String facet) { - return facetFieldResults.get(facet) == null ? new ArrayList() : facetFieldResults.get(facet); - } - - public void addFacetFieldResult(String facetField, FacetResult... facetResults) { - List facetValues = this.facetFieldResults.get(facetField); - if (facetValues == null) { - facetValues = new ArrayList(); - } - facetValues.addAll(Arrays.asList(facetResults)); - this.facetFieldResults.put(facetField, facetValues); - } - - public Map> getFacetFieldResults() { - return facetFieldResults; - } - public List getFacetResult(String facet) { return ListUtils.emptyIfNull(facetResults.get(facet)); } diff --git a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java index 092d70d9a2..b2f518c30e 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java +++ b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java @@ -21,18 +21,9 @@ import org.dspace.services.factory.DSpaceServicesFactory; */ public class DiscoveryConfigurationService { - private Map> extraConfigurationMapping = new HashMap>(); private Map map; private Map> toIgnoreMetadataFields = new HashMap<>(); - public void setExtraConfigurationMapping(Map> extraConfigurationMapping) { - this.extraConfigurationMapping = extraConfigurationMapping; - } - - public Map> getExtraConfigurationMapping() { - return extraConfigurationMapping; - } - public Map getMap() { return map; } diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml index 0cf7ad6783..c69549c446 100644 --- a/dspace/config/spring/api/discovery.xml +++ b/dspace/config/spring/api/discovery.xml @@ -345,16 +345,6 @@ search.resourcetype:2 OR search.resourcetype:[8 TO 9] - - - - - - - - - - @@ -383,26 +373,6 @@ - - - - - - dc.title - dc.contributor.author - dc.creator - dc.subject - - - - - - - - - - @@ -452,16 +422,6 @@ search.resourcetype:[10 TO 11] - - - - - - - - - - @@ -490,26 +450,6 @@ - - - - - - dc.title - dc.contributor.author - dc.creator - dc.subject - - - - - - - - - -