Skip to content
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

Jump to bottom

4.15.1 Patch - get solr server from search service bean #6004

Merged
merged 1 commit into from Jul 10, 2019
Merged

4.15.1 Patch - get solr server from search service bean #6004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Expand Up @@ -122,6 +122,7 @@
import edu.harvard.iq.dataverse.search.FacetLabel;
import edu.harvard.iq.dataverse.search.SearchConstants;
import edu.harvard.iq.dataverse.search.SearchFields;
import edu.harvard.iq.dataverse.search.SearchServiceBean;
import edu.harvard.iq.dataverse.search.SearchUtil;
import java.util.Comparator;
import java.util.TimeZone;
Expand Down Expand Up @@ -190,6 +191,8 @@ public enum DisplayMode {
@EJB
SettingsServiceBean settingsService;
@EJB
SearchServiceBean searchService;
@EJB
AuthenticationServiceBean authService;
@EJB
SystemConfig systemConfig;
Expand Down Expand Up @@ -5128,13 +5131,7 @@ public void archiveVersion(Long id) {
private SolrClient solrServer = null;

private SolrClient getSolrServer () {
if (solrServer == null) {
}
String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
solrServer = new HttpSolrClient.Builder(urlString).build();

return solrServer;

return searchService.getSolrServer();
}

private static Date getFileDateToCompare(FileMetadata fileMetadata) {
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
View file
Open in desktop
Expand Up @@ -97,6 +97,14 @@ public void close() {
}
}

public SolrClient getSolrServer() {
return solrServer;
}

public void setSolrServer(SolrClient solrServer) {
this.solrServer = solrServer;
}

/**
* Import note: "onlyDatatRelatedToMe" relies on filterQueries for providing
* access to Private Data for the correct user
Expand Down