Skip to content
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

Jump to bottom

add back variable indexing #6545 #7654

Merged
merged 2 commits into from Mar 16, 2021
Merged

add back variable indexing #6545 #7654

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd23916
add back variable indexing
Mar 4, 2021
15318a5
Merge branch 'develop' into 6545-variable-indexing
sekmiller Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 17 additions & 15 deletions src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@
import edu.harvard.iq.dataverse.dataaccess.DataAccessRequest;
import edu.harvard.iq.dataverse.dataaccess.StorageIO;
import edu.harvard.iq.dataverse.datavariable.DataVariable;
import edu.harvard.iq.dataverse.datavariable.VariableMetadata;
import edu.harvard.iq.dataverse.datavariable.VariableMetadataUtil;
import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
Expand All @@ -45,7 +46,9 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Future;
import java.util.function.Function;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.ejb.AsyncResult;
Expand Down Expand Up @@ -698,7 +701,7 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) throws Sol
return addOrUpdateDataset(indexableDataset, null);
}

private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> datafilesInDraftVersion) throws SolrServerException, IOException {
private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> datafilesInDraftVersion) throws SolrServerException, IOException {
IndexableDataset.DatasetState state = indexableDataset.getDatasetState();
Dataset dataset = indexableDataset.getDatasetVersion().getDataset();
logger.fine("adding or updating Solr document for dataset id " + dataset.getId());
Expand Down Expand Up @@ -934,8 +937,7 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
*/
if ((fileMetadata.getDataFile().isRestricted() == releasedFileMetadata.getDataFile().isRestricted())) {
if (fileMetadata.contentEquals(releasedFileMetadata)
/* SEK 3/12/2020 remove variable metadata indexing*/
// && variableMetadataUtil.compareVariableMetadata(releasedFileMetadata,fileMetadata)
&& variableMetadataUtil.compareVariableMetadata(releasedFileMetadata,fileMetadata)
) {
indexThisMetadata = false;
logger.fine("This file metadata hasn't changed since the released version; skipping indexing.");
Expand Down Expand Up @@ -1155,6 +1157,14 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
// names and labels:
if (fileMetadata.getDataFile().isTabularData()) {
List<DataVariable> variables = fileMetadata.getDataFile().getDataTable().getDataVariables();

Map<Long, VariableMetadata> variableMap = null;
List<VariableMetadata> variablesByMetadata = variableService.findVarMetByFileMetaId(fileMetadata.getId());

variableMap =
variablesByMetadata.stream().collect(Collectors.toMap(VariableMetadata::getId, Function.identity()));


for (DataVariable var : variables) {
// Hard-coded search fields, for now:
// TODO: eventually: review, decide how datavariables should
Expand All @@ -1169,21 +1179,14 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
if (var.getName() != null && !var.getName().equals("")) {
datafileSolrInputDocument.addField(SearchFields.VARIABLE_NAME, var.getName());
}

/* SEK 3/12/2020 remove variable metadata indexing
List<VariableMetadata> vmList = variableService.findByDataVarIdAndFileMetaId(var.getId(), fileMetadata.getId());
VariableMetadata vm = null;
if (vmList != null && vmList.size() >0) {
vm = vmList.get(0);
}

if (vmList.size() == 0 ) {

VariableMetadata vm = variableMap.get(var.getId());
if (vm == null) {
//Variable Label
if (var.getLabel() != null && !var.getLabel().equals("")) {
datafileSolrInputDocument.addField(SearchFields.VARIABLE_LABEL, var.getLabel());
}

} else if (vm != null) {
} else {
if (vm.getLabel() != null && !vm.getLabel().equals("") ) {
datafileSolrInputDocument.addField(SearchFields.VARIABLE_LABEL, vm.getLabel());
}
Expand All @@ -1204,7 +1207,6 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset, Set<Long> d
}

}
*/
}

// TABULAR DATA TAGS:
Expand Down