Skip to content

swap order of methods within indexAll #4062 #14

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

Merged
kcondon merged 1 commit into from
Jun 20, 2014
Merged

swap order of methods within indexAll #4062 #14

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions src/main/java/edu/harvard/iq/dataverse/IndexServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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";
}
Expand Down