From 3f9988dd09a70dc1152a47f9e6088f36e421e415 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 14 Aug 2019 14:50:47 -0400 Subject: [PATCH] reindex when datasetUpdateRequired==false and no Commands (which would trigger reindexing) are called. --- .../edu/harvard/iq/dataverse/EditDatafilesPage.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java index 025ac34fdc4..64fe544d9cc 100644 --- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java @@ -5,6 +5,7 @@ import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean; import edu.harvard.iq.dataverse.authorization.Permission; import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser; +import edu.harvard.iq.dataverse.batch.util.LoggingUtil; import edu.harvard.iq.dataverse.branding.BrandingUtil; import edu.harvard.iq.dataverse.datasetutility.AddReplaceFileHelper; import edu.harvard.iq.dataverse.datasetutility.FileReplaceException; @@ -84,6 +85,7 @@ import javax.validation.Validator; import javax.validation.ValidatorFactory; import org.apache.commons.lang.StringUtils; +import org.apache.solr.client.solrj.SolrServerException; import org.primefaces.context.RequestContext; /** @@ -1377,6 +1379,12 @@ public String save() { dataset = datasetService.find(dataset.getId()); } } + //We also need to reindex since no commands that include reindexing have been called. + indexService.indexDataset(dataset, true); + } catch (IOException | SolrServerException e) { + String failureLogText = "Post EditDatafilePage save() indexing failed. You can kickoff a re-index of this dataset with: \r\n curl http://localhost:8080/api/admin/index/datasets/" + dataset.getId().toString(); + failureLogText += "\r\n" + e.getLocalizedMessage(); + LoggingUtil.writeOnSuccessFailureLog(null, failureLogText, dataset); } finally { datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress); } @@ -1434,8 +1442,6 @@ public String save() { //if (newDraftVersion) { // return returnToDraftVersionById(); //} - // indexService.indexDataset(dataset, true); - // indexing is handled by the commands logger.fine("Redirecting to the dataset page, from the edit/upload page."); return returnToDraftVersion(); }