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

Bugfix indirect relationship discovery updates

Browse Source
This commit is contained in:
Ben Bosman
2020-12-17 12:23:00 +01:00
parent 1eaf75e1bd
commit ea24d6168c
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
View File

@@ -412,16 +412,13 @@ public class RelationshipServiceImpl implements RelationshipService {
EntityType leftType = relationship.getRelationshipType().getLeftType(); EntityType leftType = relationship.getRelationshipType().getLeftType();
String entityTypeStringFromMetadata = relationshipMetadataService.getEntityTypeStringFromMetadata(item); String entityTypeStringFromMetadata = relationshipMetadataService.getEntityTypeStringFromMetadata(item);
EntityType actualEntityType = entityTypeService.findByEntityType(context, entityTypeStringFromMetadata); EntityType actualEntityType = entityTypeService.findByEntityType(context, entityTypeStringFromMetadata);
boolean isLeft = false; relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType);
if (StringUtils.equalsIgnoreCase(leftType.getLabel(),
entityTypeStringFromMetadata)) {
relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType, false);
} else {
isLeft = true;
relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType, true);
}
for (RelationshipType relationshipType : relationshipTypes) { for (RelationshipType relationshipType : relationshipTypes) {
if (virtualMetadataPopulator.getMap().containsKey(relationshipType.getRightwardType())) { if (virtualMetadataPopulator.getMap().containsKey(relationshipType.getRightwardType())) {
boolean isLeft = false; //was always true
if (relationshipType.getRightType().equals(entityTypeStringFromMetadata)) {
isLeft = true;
}
List<Relationship> list = findByItemAndRelationshipType(context, item, relationshipType, isLeft); List<Relationship> list = findByItemAndRelationshipType(context, item, relationshipType, isLeft);
for (Relationship foundRelationship : list) { for (Relationship foundRelationship : list) {
if (isLeft) { if (isLeft) {
@@ -459,16 +456,13 @@ public class RelationshipServiceImpl implements RelationshipService {
EntityType rightType = relationship.getRelationshipType().getRightType(); EntityType rightType = relationship.getRelationshipType().getRightType();
String entityTypeStringFromMetadata = relationshipMetadataService.getEntityTypeStringFromMetadata(item); String entityTypeStringFromMetadata = relationshipMetadataService.getEntityTypeStringFromMetadata(item);
EntityType actualEntityType = entityTypeService.findByEntityType(context, entityTypeStringFromMetadata); EntityType actualEntityType = entityTypeService.findByEntityType(context, entityTypeStringFromMetadata);
boolean isLeft = false; relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType);
if (StringUtils.equalsIgnoreCase(rightType.getLabel(),
relationshipMetadataService.getEntityTypeStringFromMetadata(item))) {
isLeft = true;
relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType, true);
} else {
relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType, false);
}
for (RelationshipType relationshipType : relationshipTypes) { for (RelationshipType relationshipType : relationshipTypes) {
if (virtualMetadataPopulator.getMap().containsKey(relationshipType.getLeftwardType())) { if (virtualMetadataPopulator.getMap().containsKey(relationshipType.getLeftwardType())) {
boolean isLeft = false; //was always false
if (relationshipType.getRightType().equals(entityTypeStringFromMetadata)) {
isLeft = true;
}
List<Relationship> list = findByItemAndRelationshipType(context, item, relationshipType, isLeft); List<Relationship> list = findByItemAndRelationshipType(context, item, relationshipType, isLeft);
for (Relationship foundRelationship : list) { for (Relationship foundRelationship : list) {
if (isLeft) { if (isLeft) {