hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-4226 Conform with changes from community master

Browse Source
This commit is contained in:
Andrew Wood
2019-10-04 14:09:43 -04:00
parent 51555e4f28
commit a5af5c130a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
View File

@@ -662,7 +662,7 @@ public class MetadataImport {
if (StringUtils.equals(schema, MetadataSchemaEnum.RELATION.getName())) { if (StringUtils.equals(schema, MetadataSchemaEnum.RELATION.getName())) {
List<RelationshipType> relationshipTypeList = relationshipTypeService List<RelationshipType> relationshipTypeList = relationshipTypeService
.findByLeftOrRightLabel(c, element); .findByLeftwardOrRightwardTypeName(c, element);
for (RelationshipType relationshipType : relationshipTypeList) { for (RelationshipType relationshipType : relationshipTypeList) {
for (Relationship relationship : relationshipService for (Relationship relationship : relationshipService
.findByItemAndRelationshipType(c, item, relationshipType)) { .findByItemAndRelationshipType(c, item, relationshipType)) {
@@ -750,7 +750,7 @@ public class MetadataImport {
null, Item.ANY).get(0).getValue(); null, Item.ANY).get(0).getValue();
// Get the correct RelationshipType based on label // Get the correct RelationshipType based on label
List<RelationshipType> relType = relationshipTypeService.findByLeftOrRightLabel(c, label); List<RelationshipType> relType = relationshipTypeService.findByLeftwardOrRightwardTypeName(c, label);
RelationshipType foundRelationshipType = matchRelationshipType(relType, RelationshipType foundRelationshipType = matchRelationshipType(relType,
itemRelationshipType,relationEntityRelationshipType); itemRelationshipType,relationEntityRelationshipType);
@@ -762,7 +762,7 @@ public class MetadataImport {
"with label: " + label); "with label: " + label);
} }
if (foundRelationshipType.getLeftLabel().equalsIgnoreCase(label)) { if (foundRelationshipType.getLeftwardType().equalsIgnoreCase(label)) {
left = true; left = true;
} }
@@ -1794,7 +1794,7 @@ public class MetadataImport {
try { try {
RelationshipType foundRelationshipType = null; RelationshipType foundRelationshipType = null;
List<RelationshipType> relationshipTypeList = relationshipTypeService. List<RelationshipType> relationshipTypeList = relationshipTypeService.
findByLeftOrRightLabel(c, label.split("\\.")[1]); findByLeftwardOrRightwardTypeName(c, label.split("\\.")[1]);
// Validate described relationship form the CSV. // Validate described relationship form the CSV.
foundRelationshipType = matchRelationshipType(relationshipTypeList, targetType, originType); foundRelationshipType = matchRelationshipType(relationshipTypeList, targetType, originType);
if (foundRelationshipType == null) { if (foundRelationshipType == null) {