Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
4f8ec36
initial rough changes plus example engine
qqmyers Feb 7, 2025
2dc8e19
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Feb 11, 2025
48cae3e
Use factory in @EJB, add getDefault method and setting
qqmyers Feb 11, 2025
97246c5
more factory changes
qqmyers Feb 11, 2025
a9d386e
try dependson
qqmyers Feb 11, 2025
e45f30b
remove loop
qqmyers Feb 12, 2025
a71fb08
updates to initialization, new example
qqmyers Feb 17, 2025
48ab0ab
new ext search example
qqmyers Feb 18, 2025
709f083
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Feb 18, 2025
f2e4ff8
not @EJB
qqmyers Feb 19, 2025
153c964
GET version
qqmyers Feb 19, 2025
0f02e0b
entityId not id
qqmyers Feb 21, 2025
036be4e
add post version, refactor, cleanup
qqmyers Feb 21, 2025
f989a01
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Feb 25, 2025
aca0034
add solr to map
qqmyers Feb 26, 2025
2563f8f
allow query_entities param - #11285
qqmyers Feb 26, 2025
5d9ba16
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Feb 26, 2025
c25dbca
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Mar 5, 2025
2a9ed24
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Mar 6, 2025
6122ecd
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Mar 19, 2025
4c29efb
Change expected result format, add fine logging
qqmyers Apr 16, 2025
65b9b2b
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Apr 17, 2025
336fe4e
smaller distance first
qqmyers Apr 17, 2025
3cc6e7a
unused import
qqmyers Apr 17, 2025
75873a9
add search-engine param
qqmyers Apr 17, 2025
57d8f11
reuse searchEngine
qqmyers Apr 17, 2025
dbae5b1
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Apr 18, 2025
a628cd5
constructor for autoservice, display name
qqmyers May 8, 2025
106b478
add display name
qqmyers May 8, 2025
e90d92f
/search/engines api, refactor getAvailableServices
qqmyers May 8, 2025
5e0f0fc
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers May 13, 2025
f090fc7
display names, drop constructor fo @auto, set settingsBean for dynamic
qqmyers May 13, 2025
4e57667
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers May 15, 2025
cc48ab6
Configurable search service interface
qqmyers May 16, 2025
158d86d
move search engs to two separate jars
qqmyers May 16, 2025
82ee568
services files - @AutoService not working
qqmyers May 16, 2025
f1f3767
no arg constructors
qqmyers May 19, 2025
33c857d
dir name changes
qqmyers May 19, 2025
fe68610
remove autoservice ann.
qqmyers May 19, 2025
5f62f32
cleanup w/profiles
qqmyers May 19, 2025
3dcc511
fix param name
qqmyers May 19, 2025
8eac501
change param to search_service
qqmyers May 19, 2025
4871fa0
note experimental nature of settings
qqmyers May 19, 2025
7703be3
initial draft docs
qqmyers May 19, 2025
9cd9656
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers May 19, 2025
ae2abcc
docs updates, change api to /search/services
qqmyers May 22, 2025
b2f4d2a
fix level
qqmyers May 22, 2025
5475549
add search services to index
qqmyers May 22, 2025
e5dcb42
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers May 22, 2025
4e91e46
typo
qqmyers May 22, 2025
e107920
switch solr to stateless
qqmyers May 23, 2025
03acf29
restore query_entities to true by default (for tests, backward compat)
qqmyers May 23, 2025
86b8b60
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers May 27, 2025
239edbb
unused import
qqmyers May 27, 2025
f609100
abstract base class, separate jars for get/post ext. search
qqmyers May 28, 2025
d9968a5
Change to assembly for jars
qqmyers May 28, 2025
f6053e7
fix dup. vars
qqmyers May 28, 2025
9086be9
update name
qqmyers May 28, 2025
bf16e81
doc update
qqmyers May 28, 2025
ddcae55
fix underline
qqmyers May 28, 2025
5fa4c21
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Jun 5, 2025
98cffca
add missing params to api doc
qqmyers Jun 6, 2025
b50314e
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Jun 20, 2025
a7a4393
Apply suggestions from code review
qqmyers Jun 20, 2025
27d9f86
Merge branch 'Search_Refactor' of https://github.com/GlobalDataverseC…
qqmyers Jun 20, 2025
13573ea
Changes per review
qqmyers Jun 20, 2025
be96f1d
improve Search Services docs #11281
pdurbin Jun 24, 2025
16a24e7
Merge pull request #40 from IQSS/11281-search-services-docs
qqmyers Jun 24, 2025
b5cd5bc
fix after class name change
qqmyers Jun 24, 2025
f8a428a
Merge branch 'Search_Refactor' of https://github.com/GlobalDataverseC…
qqmyers Jun 24, 2025
bd0c745
Update src/main/java/edu/harvard/iq/dataverse/search/SearchService.java
qqmyers Jun 24, 2025
3ee8bc8
Merge branch 'Search_Refactor' of https://github.com/GlobalDataverseC…
qqmyers Jun 24, 2025
c423dcf
PIDs in addition to DOIs
qqmyers Jun 24, 2025
b69d0e8
add defaultService to API
qqmyers Jun 24, 2025
8c161a8
static solr string
qqmyers Jun 24, 2025
bfa99d0
add settings to release note/docs
qqmyers Jun 24, 2025
927ceb1
more name changes
qqmyers Jun 24, 2025
9371b3b
Merge remote-tracking branch 'IQSS/develop' into Search_Refactor
qqmyers Jun 26, 2025
d49256c
exclude ext search classes
qqmyers Jun 26, 2025
f88792d
use constant in more places
qqmyers Jun 26, 2025
56a6310
disable/don't load any non-solr search services in war
qqmyers Jun 27, 2025
965ee18
fix indenting #11281
pdurbin Jun 27, 2025
ec348a7
add comments to keep excludes in sync #11281
pdurbin Jun 27, 2025
7ca8b26
Merge branch 'develop' into Search_Refactor #11281
pdurbin Jun 27, 2025
8ce370c
tweak release note #11281
pdurbin Jun 27, 2025
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
Prev Previous commit
Next Next commit
static solr string
  • Loading branch information
qqmyers committed Jun 24, 2025
commit 8c161a86c04893b46843dd2ee696abc047ce8e1e
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class SearchServiceFactory {
SettingsServiceBean settingsService;

private SearchService solrSearchService;
private static String INTERNAL_SOLR_SERVICE_NAME = "solr";

private Map<String, SearchService> serviceMap = new HashMap<>();

Expand All @@ -45,7 +46,7 @@ private void loadSearchServices() {
for (Bean<?> bean : beans) {
SearchService service = (SearchService) beanManager.getReference(bean, SearchService.class,
beanManager.createCreationalContext(bean));
if ("solr".equals(service.getServiceName())) {
if (INTERNAL_SOLR_SERVICE_NAME.equals(service.getServiceName())) {
//May be a proxy and not a SolrSearchServiceBean at this point
solrSearchService = service;
}
Expand Down Expand Up @@ -83,7 +84,7 @@ private void loadSearchServices() {
}
}
for (String service : getAvailableServices().keySet()) {
logger.log(Level.INFO, "Setting solr search service for: {0}", service);
logger.log(Level.FINE, "Setting solr search service for: {0}", service);
getSearchService(service).setSolrSearchService(solrSearchService);
}

Expand All @@ -99,9 +100,9 @@ public SearchService getSearchService(String name) {
}

public SearchService getDefaultSearchService() {
String defaultService = JvmSettings.DEFAULT_SEARCH_SERVICE.lookupOptional().orElse("solr");
logger.log(Level.INFO, "Using default search service: {0}", defaultService);
return getSearchService(JvmSettings.DEFAULT_SEARCH_SERVICE.lookupOptional().orElse("solr"));
String defaultService = JvmSettings.DEFAULT_SEARCH_SERVICE.lookupOptional().orElse(INTERNAL_SOLR_SERVICE_NAME);
logger.log(Level.FINE, "Using default search service: {0}", defaultService);
return getSearchService(defaultService);
}

public Map<String, SearchService> getAvailableServices() {
Expand Down