Skip to content

use authority instead of value for type-bind #355

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

Open
philippcle wants to merge 2 commits into
base: dspace-cris-7
Choose a base branch
from
Open

use authority instead of value for type-bind #355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ad05c6
use authority instead of value for type-bind
philippcle Jul 7, 2023
f80d2fe
use embedded functionality
philippcle Jul 7, 2023
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
18 changes: 9 additions & 9 deletions dspace-api/src/main/java/org/dspace/validation/MetadataValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ public List<ValidationError> validate(Context context, InProgressSubmission<?> o
List<ValidationError> errors = new ArrayList<>();

DCInputSet inputConfig = getDCInputSet(config);
String documentTypeValue = getDocumentTypeValue(obj);
String documentTypeAuthority = getDocumentTypeAuthority(obj);

// Get list of all field names (including qualdrop names) allowed for this dc.type
List<String> allowedFieldNames = inputConfig.populateAllowedFieldNames(documentTypeValue);
List<String> allowedFieldNames = inputConfig.populateAllowedFieldNames(documentTypeAuthority);

for (DCInput[] row : inputConfig.getFields()) {
for (DCInput input : row) {
Expand All @@ -93,7 +93,7 @@ public List<ValidationError> validate(Context context, InProgressSubmission<?> o

// Check the lookup list. If no other inputs of the same field name allow this type,
// then remove. This includes field name without qualifier.
if (!input.isAllowedFor(documentTypeValue) && (!allowedFieldNames.contains(fullFieldname)
if (!input.isAllowedFor(documentTypeAuthority) && (!allowedFieldNames.contains(fullFieldname)
&& !allowedFieldNames.contains(input.getFieldName()))) {
removeMetadataValues(context, obj.getItem(), mdv);
} else {
Expand All @@ -118,18 +118,18 @@ public List<ValidationError> validate(Context context, InProgressSubmission<?> o
for (String fieldName : fieldsName) {
boolean valuesRemoved = false;
List<MetadataValue> mdv = itemService.getMetadataByMetadataString(obj.getItem(), fieldName);
if (!input.isAllowedFor(documentTypeValue)) {
if (!input.isAllowedFor(documentTypeAuthority)) {
// Check the lookup list. If no other inputs of the same field name allow this type,
// then remove. Otherwise, do not
if (!(allowedFieldNames.contains(fieldName))) {
removeMetadataValues(context, obj.getItem(), mdv);
valuesRemoved = true;
log.debug("Stripping metadata values for " + input.getFieldName() + " on type "
+ documentTypeValue + " as it is allowed by another input of the same field " +
+ documentTypeAuthority + " as it is allowed by another input of the same field " +
"name");
} else {
log.debug("Not removing unallowed metadata values for " + input.getFieldName() + " on type "
+ documentTypeValue + " as it is allowed by another input of the same field " +
+ documentTypeAuthority + " as it is allowed by another input of the same field " +
"name");
}
}
Expand All @@ -139,7 +139,7 @@ public List<ValidationError> validate(Context context, InProgressSubmission<?> o
&& !valuesRemoved) {
// Is the input required for *this* type? In other words, are we looking at a required
// input that is also allowed for this document type
if (input.isAllowedFor(documentTypeValue)) {
if (input.isAllowedFor(documentTypeAuthority)) {
// since this field is missing add to list of error
// fields
addError(errors, ERROR_VALIDATION_REQUIRED,
Expand All @@ -153,10 +153,10 @@ public List<ValidationError> validate(Context context, InProgressSubmission<?> o
return errors;
}

private String getDocumentTypeValue(InProgressSubmission<?> obj) {
private String getDocumentTypeAuthority(InProgressSubmission<?> obj) {
String documentTypeField = configurationService.getProperty("submit.type-bind.field", "dc.type");
List<MetadataValue> documentType = itemService.getMetadataByMetadataString(obj.getItem(), documentTypeField);
return documentType.size() > 0 ? documentType.get(0).getValue() : "";
return !documentType.isEmpty() ? documentType.get(0).getAuthority() : "";
}

private DCInputSet getDCInputSet(SubmissionStepConfig config) {
Expand Down