Merge pull request #11759 from IQSS/revert-11551-11536-Inconsistency-between-subject-metrics-for-dataverses-and-datasets

Revert "Added a control to publishing a Dataset and cleaning dataversesubjects table"

Author: ofahimIQSS

src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java

@@ -334,16 +334,12 @@ private void updateParentDataversesSubjectsField(Dataset savedDataset, CommandCo
                 while (dv != null) {
                     boolean newSubjectsAdded = false;
                     for (ControlledVocabularyValue cvv : dsf.getControlledVocabularyValues()) {                   
-                        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());
-                            }
+                        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("Subject is not recognized : " + cvv.getStrValue());
+                            logger.fine("dv "+dv.getAlias()+" already has subject "+cvv.getStrValue());
                         }
                     }
                     if (newSubjectsAdded) {