hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 23:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply 6x commits

Browse Source
This commit is contained in:
Terry W Brady
2017-01-31 15:02:55 -08:00
parent 1af506d35f
commit 9e84117557
1 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
View File

@@ -181,6 +181,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
{ {
return; return;
} }
initSolrYearCores();
try try
@@ -220,6 +221,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
if (solr == null || locationService == null) { if (solr == null || locationService == null) {
return; return;
} }
initSolrYearCores();
try { try {
SolrInputDocument doc1 = getCommonSolrDoc(dspaceObject, ip, userAgent, xforwardedfor, SolrInputDocument doc1 = getCommonSolrDoc(dspaceObject, ip, userAgent, xforwardedfor,
@@ -247,7 +249,6 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
} }
} }
/** /**
* Returns a solr input document containing common information about the statistics * Returns a solr input document containing common information about the statistics
* regardless if we are logging a search or a view of a DSpace object * regardless if we are logging a search or a view of a DSpace object
@@ -445,6 +446,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
{ {
SolrInputDocument solrDoc = getCommonSolrDoc(resultObject, request, currentUser); SolrInputDocument solrDoc = getCommonSolrDoc(resultObject, request, currentUser);
if (solrDoc == null) return; if (solrDoc == null) return;
initSolrYearCores();
for (String query : queries) { for (String query : queries) {
solrDoc.addField("query", query); solrDoc.addField("query", query);
@@ -491,6 +493,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
@Override @Override
public void postWorkflow(UsageWorkflowEvent usageWorkflowEvent) throws SQLException { public void postWorkflow(UsageWorkflowEvent usageWorkflowEvent) throws SQLException {
initSolrYearCores();
try { try {
SolrInputDocument solrDoc = getCommonSolrDoc(usageWorkflowEvent.getObject(), null, null); SolrInputDocument solrDoc = getCommonSolrDoc(usageWorkflowEvent.getObject(), null, null);