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

Merge pull request #3304 from tdonohue/search_scope_null

Browse Source 
Searches without a scope can trigger "Invalid UUID" error from ScopeResolver
This commit is contained in:
Tim Donohue
2021-06-23 09:43:36 -05:00
committed by GitHub
parent 418911e890 9ecfe40f41
commit 0cfe4d0686
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java
View File

@@ -34,9 +34,12 @@ public class SearchEventConverter {
null); null);
usageSearchEvent.setQuery(searchEventRest.getQuery()); usageSearchEvent.setQuery(searchEventRest.getQuery());
usageSearchEvent.setDsoType(searchEventRest.getDsoType()); usageSearchEvent.setDsoType(searchEventRest.getDsoType());
IndexableObject scopeObject = scopeResolver.resolveScope(context, String.valueOf(searchEventRest.getScope())); if (searchEventRest.getScope() != null) {
if (scopeObject instanceof DSpaceObject) { IndexableObject scopeObject =
usageSearchEvent.setScope((DSpaceObject) scopeObject); scopeResolver.resolveScope(context, String.valueOf(searchEventRest.getScope()));
if (scopeObject instanceof DSpaceObject) {
usageSearchEvent.setScope((DSpaceObject) scopeObject);
}
} }
usageSearchEvent.setConfiguration(searchEventRest.getConfiguration()); usageSearchEvent.setConfiguration(searchEventRest.getConfiguration());
if (searchEventRest.getAppliedFilters() != null) { if (searchEventRest.getAppliedFilters() != null) {