Skip to content

Added a control to publishing a Dataset and cleaning dataversesubjects table #11551

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
ofahimIQSS merged 5 commits into from
Aug 21, 2025
Merged

Added a control to publishing a Dataset and cleaning dataversesubjects table #11551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1de2bbf
Added a control to publishing a Dataset and cleaning the dataversesub…
stevenferey Jun 4, 2025
2bcd34e
Increment name SQL script
stevenferey Jul 16, 2025
261c01c
Merge branch 'develop' into 11536-Inconsistency-between-subject-metri…
stevenferey Jul 16, 2025
c494103
Adapted the name of the SQL script for the release of Dataverse 6.8
stevenferey Jul 16, 2025
87df34f
Merge branch 'develop' into 11536-Inconsistency-between-subject-metri…
pdurbin Aug 20, 2025
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
14 changes: 9 additions & 5 deletions .../java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
View file
Open in desktop
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.0.1.sql
View file
Open in desktop
Copy link
Copy Markdown
Member

@pdurbin pdurbin Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have been called V6.7.1.2.sql

Copy link
Copy Markdown
Member

@pdurbin pdurbin Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stevenferey we had to revert this in PR #11759 because the Flyway script had the wrong name. Can you please create a fresh PR? Thanks!

Copy link
Copy Markdown
Contributor Author

@stevenferey stevenferey Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pdurbin, I just created PR #11765 .
I hope this works. Thanks.

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 ;
Loading