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

[DS-3695] Replace removed default schema settings with query parameters.

Browse Source
This commit is contained in:
Mark H. Wood
2019-02-13 10:56:13 -05:00
parent 732bc7d92f
commit 69fcb0ebce
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
View File

@@ -971,6 +971,15 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
.setFacetMinCount(1); .setFacetMinCount(1);
addAdditionalSolrYearCores(solrQuery); addAdditionalSolrYearCores(solrQuery);
// Can no longer set default field in schema
if (null == solrQuery.get("df")) {
solrQuery.add("df", "id");
}
// Can no longer set default match operator in schema
if (null == solrQuery.get("q.op")) {
solrQuery.add("q.op", "AND");
}
// Set the date facet if present // Set the date facet if present
if (dateType != null) { if (dateType != null) {
solrQuery.setParam("facet.date", "time") solrQuery.setParam("facet.date", "time")

10
dspace-oai/src/main/java/org/dspace/xoai/solr/DSpaceSolrSearch.java
View File

@@ -32,8 +32,16 @@ public class DSpaceSolrSearch {
public static SolrDocumentList query(SolrClient server, SolrQuery solrParams) public static SolrDocumentList query(SolrClient server, SolrQuery solrParams)
throws DSpaceSolrException, IOException { throws DSpaceSolrException, IOException {
try {
solrParams.addSort("item.id", ORDER.asc); solrParams.addSort("item.id", ORDER.asc);
// No longer can set default search field in the schema
if (null == solrParams.get("df")) {
solrParams.set("df", "item.handle");
}
// No longer can set default match operator in the schema
if (null == solrParams.get("q.op")) {
solrParams.set("q.op", "OR");
}
try {
QueryResponse response = server.query(solrParams); QueryResponse response = server.query(solrParams);
return response.getResults(); return response.getResults();
} catch (SolrServerException ex) { } catch (SolrServerException ex) {