Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -334,12 +334,16 @@ private void updateParentDataversesSubjectsField(Dataset savedDataset, CommandCo
while (dv != null) {
boolean newSubjectsAdded = false;
for (ControlledVocabularyValue cvv : dsf.getControlledVocabularyValues()) {
if (!dv.getDataverseSubjects().contains(cvv)) {
logger.fine("dv "+dv.getAlias()+" does not have subject "+cvv.getStrValue());
newSubjectsAdded = true;
dv.getDataverseSubjects().add(cvv);
if (!cvv.getStrValue().equals(DatasetField.NA_VALUE)) {
if (!dv.getDataverseSubjects().contains(cvv)) {
logger.fine("dv "+dv.getAlias()+" does not have subject "+cvv.getStrValue());
newSubjectsAdded = true;
dv.getDataverseSubjects().add(cvv);
} else {
logger.fine("dv "+dv.getAlias()+" already has subject "+cvv.getStrValue());
}
} else {
logger.fine("dv "+dv.getAlias()+" already has subject "+cvv.getStrValue());
logger.fine("Subject is not recognized : " + cvv.getStrValue());
}
}
if (newSubjectsAdded) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/db/migration/V6.7.1.2.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- remove dataversesubjects entries with a controlledvocabularyvalue_id matching "N/A"
DELETE FROM dataversesubjects WHERE controlledvocabularyvalue_id = 1 ;