Skip to content

Clarin9/Make default search items-only, configurable via discovery.cfg #1423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milanmajchrak merged 3 commits into from
Sep 3, 2026
Merged

Clarin9/Make default search items-only, configurable via discovery.cfg #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2837d5e
Restrict default Discovery search to items only
Sep 1, 2026
c748bd0
Make default-search resource types configurable via discovery.cfg
Sep 1, 2026
899be67
Keep all-types default search in test config for upstream Discovery ITs
Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dspace-api/src/test/data/dspaceFolder/config/local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ event.dispatcher.default.consumers = versioning, discovery, eperson, orcidqueue,
event.dispatcher.exclude-discovery.class = org.dspace.event.BasicDispatcher
event.dispatcher.exclude-discovery.consumers = versioning, eperson, qaeventsdelete, ldnmessage

# The CLARIN default search is items-only (see config/modules/discovery.cfg); the upstream Discovery
# ITs assert communities and collections in the default search, so keep the original all-types query here.
discovery.search.default.filterquery = (search.resourcetype:Item AND latestVersion:true) OR search.resourcetype:Collection OR search.resourcetype:Community

# Configure authority control for Unit Testing (in DSpaceControlledVocabularyTest)
# (This overrides default, commented out settings in dspace.cfg)
plugin.selfnamed.org.dspace.content.authority.ChoiceAuthority = \
Expand Down
5 changes: 5 additions & 0 deletions dspace/config/modules/discovery.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
##### Search Indexing #####
discovery.search.server = ${solr.server}/${solr.multicorePrefix}search

# Resource types returned by the default search (/search). Items only by default (CLARIN).
# To also return communities and collections, use:
# discovery.search.default.filterquery = (search.resourcetype:Item AND latestVersion:true) OR search.resourcetype:Collection OR search.resourcetype:Community
discovery.search.default.filterquery = search.resourcetype:Item AND latestVersion:true

#Enable the url validation of the search.server setting above.
#Defaults to true: validation is enabled
#discovery.solr.url.validation.enabled = true
Expand Down
4 changes: 2 additions & 2 deletions dspace/config/spring/api/discovery.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@
queries done by discovery for this configuration -->
<property name="defaultFilterQueries">
<list>
<!--Only find items, communities and collections-->
<value>(search.resourcetype:Item AND latestVersion:true) OR search.resourcetype:Collection OR search.resourcetype:Community</value>
<!--CLARIN: resource types returned by the default search; configurable via discovery.cfg (items only by default)-->
<value>${discovery.search.default.filterquery}</value>
<value>-withdrawn:true AND -discoverable:false</value>
</list>
</property>
Expand Down
Loading