Merge pull request IQSS#14 from IQSS/master

swap order of methods within indexAll IQSS#4062
rpartridge · Jun 20, 2014 · 9d7f6d8 · 9d7f6d8
2 parents 3ef810d + 46ddb55
commit 9d7f6d8
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/IndexServiceBean.java
@@ -77,23 +77,6 @@ public String indexAll() {
             return ex.toString();
         }
 
-        List<Dataverse> dataverses = dataverseService.findAll();
-        int dataverseIndexCount = 0;
-        for (Dataverse dataverse : dataverses) {
-            logger.info("indexing dataverse " + dataverseIndexCount + " of " + dataverses.size() + ": " + indexDataverse(dataverse));
-            dataverseIndexCount++;
-        }
-
-        int datasetIndexCount = 0;
-        List<Dataset> datasets = datasetService.findAll();
-        for (Dataset dataset : datasets) {
-            datasetIndexCount++;
-            logger.info("indexing dataset " + datasetIndexCount + " of " + datasets.size() + ": " + indexDataset(dataset));
-        }
-//        logger.info("advanced search fields: " + advancedSearchFields);
-//        logger.info("not advanced search fields: " + notAdvancedSearchFields);
-        logger.info("done iterating through all datasets");
-
         /**
          * @todo: replace hard-coded groups with real groups
          */
@@ -114,6 +97,22 @@ public String indexAll() {
             userIndexCount++;
             logger.info("indexing user " + userIndexCount + " of several: " + indexUser(user));
         }
+        List<Dataverse> dataverses = dataverseService.findAll();
+        int dataverseIndexCount = 0;
+        for (Dataverse dataverse : dataverses) {
+            logger.info("indexing dataverse " + dataverseIndexCount + " of " + dataverses.size() + ": " + indexDataverse(dataverse));
+            dataverseIndexCount++;
+        }
+
+        int datasetIndexCount = 0;
+        List<Dataset> datasets = datasetService.findAll();
+        for (Dataset dataset : datasets) {
+            datasetIndexCount++;
+            logger.info("indexing dataset " + datasetIndexCount + " of " + datasets.size() + ": " + indexDataset(dataset));
+        }
+//        logger.info("advanced search fields: " + advancedSearchFields);
+//        logger.info("not advanced search fields: " + notAdvancedSearchFields);
+        logger.info("done iterating through all datasets");
 
         return dataverseIndexCount + " dataverses, " + datasetIndexCount + " datasets, " + groupIndexCount + " groups, and " + userIndexCount + " users indexed\n";
     }