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

* Restrict default Discovery search to items only

Remove communities and collections from the default search configuration's
filter queries so /search returns items only (restores CLARIN v7 behaviour
at the source, for all API consumers). Query-time filter; no reindex needed.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* Make default-search resource types configurable via discovery.cfg

Externalize the default Discovery filter query to a new
discovery.search.default.filterquery property (items only by default;
documented all-types alternative), referenced from discovery.xml.
Admins can now include/exclude communities and collections from /search
without editing Spring XML.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* Keep all-types default search in test config for upstream Discovery ITs

The upstream DiscoveryRestControllerIT / DiscoveryVersioningIT assert that
the default search returns communities and collections. The CLARIN default
is now items-only, so pin the original all-types filter query in the test
local.cfg to keep those ITs valid without editing their assertions.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: Matus Kasak <matus.kasak@dataquest.sk>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: 3 people

dspace-api/src/test/data/dspaceFolder/config/local.cfg

@@ -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 = \

dspace/config/modules/discovery.cfg

@@ -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

dspace/config/spring/api/discovery.xml

@@ -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>