From f35b959cb51f3b39e2d95ea28c47536b8788b4af Mon Sep 17 00:00:00 2001 From: KevinVdV Date: Fri, 14 Feb 2014 14:35:27 +0100 Subject: [PATCH] [DS-1912] Discovery facets do not always use the authority identifier --- .../dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java | 2 +- .../app/xmlui/aspect/discovery/SidebarFacetsTransformer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java index 1a9914b604..b2a8e880d6 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java @@ -425,7 +425,7 @@ public class SearchFacetFilter extends AbstractDSpaceTransformer implements Cach //Last add the current filter query url += "&filtertype=" + facetField; url += "&filter_relational_operator="+value.getFilterType(); - url += "&filter=" + URLEncoder.encode(displayedValue, "UTF-8"); + url += "&filter=" + URLEncoder.encode(value.getAsFilterQuery(), "UTF-8"); cell.addXref(url, displayedValue + " (" + value.getCount() + ")" ); } diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java index 00573d67af..4e4229ff98 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java @@ -232,7 +232,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen String displayedValue = value.getDisplayedValue(); String filterQuery = value.getAsFilterQuery(); String filterType = value.getFilterType(); - if (fqs.contains(getSearchService().toFilterQuery(context, field.getIndexFieldName(), "equals", value.getDisplayedValue()).getFilterQuery())) { + if (fqs.contains(getSearchService().toFilterQuery(context, field.getIndexFieldName(), value.getFilterType(), value.getAsFilterQuery()).getFilterQuery())) { filterValsList.addItem(Math.random() + "", "selected").addContent(displayedValue + " (" + value.getCount() + ")"); } else { String paramsQuery = retrieveParameters(request);