diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java index 019cdd76cc..68833f57ee 100644 --- a/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java +++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java @@ -199,20 +199,22 @@ public class DSpaceCSV implements Serializable { } // Check that the scheme exists - MetadataSchema foundSchema = metadataSchemaService.find(c, metadataSchema); - if (foundSchema == null) { - throw new MetadataImportInvalidHeadingException(clean[0], - MetadataImportInvalidHeadingException.SCHEMA, - columnCounter); - } + if (!StringUtils.equals(metadataSchema, "relation")) { + MetadataSchema foundSchema = metadataSchemaService.find(c, metadataSchema); + if (foundSchema == null) { + throw new MetadataImportInvalidHeadingException(clean[0], + MetadataImportInvalidHeadingException.SCHEMA, + columnCounter); + } - // Check that the metadata element exists in the schema - MetadataField foundField = metadataFieldService - .findByElement(c, foundSchema, metadataElement, metadataQualifier); - if (foundField == null && !StringUtils.equals(metadataSchema, "relationship")) { - throw new MetadataImportInvalidHeadingException(clean[0], - MetadataImportInvalidHeadingException.ELEMENT, - columnCounter); + // Check that the metadata element exists in the schema + MetadataField foundField = metadataFieldService + .findByElement(c, foundSchema, metadataElement, metadataQualifier); + if (foundField == null) { + throw new MetadataImportInvalidHeadingException(clean[0], + MetadataImportInvalidHeadingException.ELEMENT, + columnCounter); + } } // Store the heading diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java index 7aac6fc8b9..20b8c4fa39 100644 --- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java +++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java @@ -355,7 +355,7 @@ public class MetadataImport { // Add the metadata to the item List relationships = new LinkedList<>(); for (BulkEditMetadataValue dcv : whatHasChanged.getAdds()) { - if (StringUtils.equals(dcv.getSchema(), "relationship")) { + if (StringUtils.equals(dcv.getSchema(), "relation")) { if (!StringUtils.equals(dcv.getElement(), "type")) { relationships.add(dcv); @@ -628,7 +628,7 @@ public class MetadataImport { } - if (StringUtils.equals(schema, "relationship")) { + if (StringUtils.equals(schema, "relation")) { handleRelationMetadata(c, item, schema, element, qualifier, language, values, authorities, confidences); } else { itemService.clearMetadata(c, item, schema, element, qualifier, language);