From 819d3433f460b1423149ad5f2055f7c6a608eead Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Tue, 11 Dec 2018 14:35:22 -0500 Subject: [PATCH 1/2] #4235 trim trailing spaces --- .../edu/harvard/iq/dataverse/DatasetField.java | 16 ++++++++++++++++ .../command/impl/AbstractDatasetCommand.java | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java index 2d247ca4032..d0524a6455c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java @@ -550,6 +550,22 @@ public void setValueDisplayOrder() { } } } + + public void trimTrailingSpaces() { + if (this.getDatasetFieldType().isPrimitive() && !this.getDatasetFieldType().isControlledVocabulary()) { + for (int i = 0; i < datasetFieldValues.size(); i++) { + datasetFieldValues.get(i).setValue(datasetFieldValues.get(i).getValue().trim()); + } + } else if (this.getDatasetFieldType().isCompound()) { + for (int i = 0; i < datasetFieldCompoundValues.size(); i++) { + DatasetFieldCompoundValue compoundValue = datasetFieldCompoundValues.get(i); + for (DatasetField dsf : compoundValue.getChildDatasetFields()) { + dsf.trimTrailingSpaces(); + } + } + } + } + public void addDatasetFieldValue(int index) { datasetFieldValues.add(index, new DatasetFieldValue(this)); diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java index 775eeecb9b7..91cf505dba6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java @@ -130,6 +130,10 @@ protected void tidyUpFields(DatasetVersion dsv) { while (dsfItSort.hasNext()) { dsfItSort.next().setValueDisplayOrder(); } + Iterator dsfItTrim = dsv.getDatasetFields().iterator(); + while (dsfItTrim.hasNext()) { + dsfItTrim.next().trimTrailingSpaces(); + } } /** From 56c1cb7304c8de1cc26f5dd905dcff080b5914c6 Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Tue, 11 Dec 2018 16:09:06 -0500 Subject: [PATCH 2/2] #4235 fix code formatting --- src/main/java/edu/harvard/iq/dataverse/DatasetField.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java index d0524a6455c..d9250c4093f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java @@ -558,7 +558,7 @@ public void trimTrailingSpaces() { } } else if (this.getDatasetFieldType().isCompound()) { for (int i = 0; i < datasetFieldCompoundValues.size(); i++) { - DatasetFieldCompoundValue compoundValue = datasetFieldCompoundValues.get(i); + DatasetFieldCompoundValue compoundValue = datasetFieldCompoundValues.get(i); for (DatasetField dsf : compoundValue.getChildDatasetFields()) { dsf.trimTrailingSpaces(); }