fixed indexing issue #4406

IQSS · Apr 19, 2018 · cbbff51 · cbbff51
1 parent c46a5ca
commit cbbff51
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java
@@ -171,13 +171,23 @@ public void indexDataverseRecursively(Dataverse dataverse) {
         int datasetIndexCount = 0, datasetFailureCount = 0, dataverseIndexCount = 0, dataverseFailureCount = 0;
         // get list of Dataverse children
         List<Long> dataverseChildren = dataverseService.findAllDataverseDataverseChildren(dataverse.getId());
-        dataverseChildren.add(dataverse.getId());
 
         // get list of Dataset children
         List<Long> datasetChildren = dataverseService.findAllDataverseDatasetChildren(dataverse.getId());
 
-        logger.info("Starting index on " + dataverseChildren.size() + " dataverses and " + datasetChildren.size() + " datasets.");
-
+        logger.info("Starting index on " + (dataverseChildren.size() + 1) + " dataverses and " + datasetChildren.size() + " datasets.");
+
+        // first we have to index the root dataverse or it will not index properly
+        try {
+            dataverseIndexCount++;
+            logger.info("indexing dataverse " + dataverseIndexCount + " of " + (dataverseChildren.size() + 1) + " (id=" + dataverse.getId() + ", persistentId=" + dataverse.getAlias() + ")");
+            indexService.indexDataverseInNewTransaction(dataverse);
+        } catch (Exception e) {
+            //We want to keep running even after an exception so throw some more info into the log
+            dataverseFailureCount++;
+            logger.info("FAILURE indexing dataverse " + dataverseIndexCount + " of " + (dataverseChildren.size() + 1) + " (id=" + dataverse.getId() + ") Exception info: " + e.getMessage());
+        }
+
         // index the Dataverse children
         for (Long childId : dataverseChildren) {
             try {