114618: Cherry-pick & Fix Conflicts

atmire · Apr 25, 2024 · d69ab0c · d69ab0c
1 parent 122924a
commit d69ab0c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java b/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java
@@ -17,6 +17,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.util.ClientUtils;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Item;
@@ -205,6 +206,10 @@ private DiscoverResult getSolrResponse() throws BrowseException {
                 } else if (valuePartial) {
                     query.addFilterQueries("{!field f=" + facetField + "_partial}" + value);
                 }
+                if (StringUtils.isNotBlank(startsWith) && orderField != null) {
+                    query.addFilterQueries(
+                        "bi_" + orderField + "_sort:" + ClientUtils.escapeQueryChars(startsWith) + "*");
+                }
                 // filter on item to be sure to don't include any other object
                 // indexed in the Discovery Search core
                 query.addFilterQueries("search.resourcetype:" + IndexableItem.TYPE);