hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 23:13:10 +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 13:24:12 +01:00
parent 47888e7975
commit fbfc352768
1 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,9 +382,9 @@ public class RelationshipServiceImpl implements RelationshipService {
itemsToUpdate.add(relationship.getLeftItem()); itemsToUpdate.add(relationship.getLeftItem());
itemsToUpdate.add(relationship.getRightItem()); itemsToUpdate.add(relationship.getRightItem());
getRelatedItemsForLeftItem(context, relationship.getLeftItem(), findRelatedItemsForLeftItem(context, relationship.getLeftItem(),
relationship, itemsToUpdate, max, 0, maxDepth); relationship, itemsToUpdate, max, 0, maxDepth);
getRelatedItemsForRightItem(context, relationship.getRightItem(), findRelatedItemsForRightItem(context, relationship.getRightItem(),
relationship, itemsToUpdate, max, 0, maxDepth); relationship, itemsToUpdate, max, 0, maxDepth);
for (Item item : itemsToUpdate) { for (Item item : itemsToUpdate) {
@@ -399,92 +399,90 @@ public class RelationshipServiceImpl implements RelationshipService {
context.restoreAuthSystemState(); context.restoreAuthSystemState();
} }
private List<Item> getRelatedItemsForRightItem(Context context, Item item, Relationship relationship, private void findRelatedItemsForRightItem(Context context, Item item, Relationship relationship,
List<Item> itemsToUpdate, int max, int currentDepth, int maxDepth) List<Item> itemsToUpdate, int max, int currentDepth, int maxDepth)
throws SQLException { throws SQLException {
if (itemsToUpdate.size() >= max) { if (itemsToUpdate.size() >= max) {
return itemsToUpdate; log.debug("skipping findRelatedItemsForRightItem for item "
+ item.getID() + " due to " + itemsToUpdate.size() + " items to be updated");
return;
} }
if (currentDepth == maxDepth) { if (currentDepth == maxDepth) {
return itemsToUpdate; log.debug("skipping findRelatedItemsForRightItem for item "
+ item.getID() + " due to " + currentDepth + " depth");
return;
} }
List<RelationshipType> relationshipTypes = new LinkedList<>();
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);
relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType); List<RelationshipType> relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType);
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 boolean isLeft = relationshipType.getLeftType().equals(actualEntityType); //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) {
if (!itemsToUpdate.contains(foundRelationship.getRightItem())) { if (!itemsToUpdate.contains(foundRelationship.getRightItem())) {
itemsToUpdate.add(foundRelationship.getRightItem()); itemsToUpdate.add(foundRelationship.getRightItem());
getRelatedItemsForRightItem(context, foundRelationship.getRightItem(), findRelatedItemsForRightItem(context, foundRelationship.getRightItem(),
foundRelationship, itemsToUpdate, max, currentDepth + 1, maxDepth); foundRelationship, itemsToUpdate, max, currentDepth + 1, maxDepth);
} }
} else { } else {
if (!itemsToUpdate.contains(foundRelationship.getLeftItem())) { if (!itemsToUpdate.contains(foundRelationship.getLeftItem())) {
itemsToUpdate.add(foundRelationship.getLeftItem()); itemsToUpdate.add(foundRelationship.getLeftItem());
getRelatedItemsForLeftItem(context, foundRelationship.getLeftItem(), findRelatedItemsForLeftItem(context, foundRelationship.getLeftItem(),
foundRelationship, itemsToUpdate, max, currentDepth + 1, maxDepth); foundRelationship, itemsToUpdate, max, currentDepth + 1, maxDepth);
} }
} }
} }
} else { } else {
log.debug("skipping " + relationshipType.getID() + " in getRelatedItemsForRightItem for item " log.debug("skipping " + relationshipType.getID() + " in findRelatedItemsForRightItem for item "
+ item.getID()); + item.getID() + " because no relevant virtual metadata was found");
} }
} }
return itemsToUpdate;
} }
private List<Item> getRelatedItemsForLeftItem(Context context, Item item, Relationship relationship, private void findRelatedItemsForLeftItem(Context context, Item item, Relationship relationship,
List<Item> itemsToUpdate, int max, int currentDepth, int maxDepth) List<Item> itemsToUpdate, int max, int currentDepth, int maxDepth)
throws SQLException { throws SQLException {
if (itemsToUpdate.size() >= max) { if (itemsToUpdate.size() >= max) {
return itemsToUpdate; log.debug("skipping findRelatedItemsForLeftItem for item "
+ item.getID() + " due to " + itemsToUpdate.size() + " items to be updated");
return;
} }
if (currentDepth == maxDepth) { if (currentDepth == maxDepth) {
return itemsToUpdate; log.debug("skipping findRelatedItemsForLeftItem for item "
+ item.getID() + " due to " + currentDepth + " depth");
return;
} }
List<RelationshipType> relationshipTypes = new LinkedList<>();
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);
relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType); List<RelationshipType> relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType);
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 boolean isLeft = relationshipType.getRightType().equals(actualEntityType); //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) {
if (!itemsToUpdate.contains(foundRelationship.getRightItem())) { if (!itemsToUpdate.contains(foundRelationship.getRightItem())) {
itemsToUpdate.add(foundRelationship.getRightItem()); itemsToUpdate.add(foundRelationship.getRightItem());
itemsToUpdate.addAll(getRelatedItemsForRightItem(context, foundRelationship.getRightItem(), findRelatedItemsForRightItem(context, foundRelationship.getRightItem(),
foundRelationship, itemsToUpdate, max, currentDepth + 1, maxDepth)); foundRelationship, itemsToUpdate, max, currentDepth + 1, maxDepth);
} }
} else { } else {
if (!itemsToUpdate.contains(foundRelationship.getLeftItem())) { if (!itemsToUpdate.contains(foundRelationship.getLeftItem())) {
itemsToUpdate.add(foundRelationship.getLeftItem()); itemsToUpdate.add(foundRelationship.getLeftItem());
itemsToUpdate.addAll(getRelatedItemsForLeftItem(context, foundRelationship.getLeftItem(), findRelatedItemsForLeftItem(context, foundRelationship.getLeftItem(),
foundRelationship, itemsToUpdate, max, currentDepth + 1, maxDepth)); foundRelationship, itemsToUpdate, max, currentDepth + 1, maxDepth);
} }
} }
} }
} else { } else {
log.debug("skipping " + relationshipType.getID() + " in getRelatedItemsForLeftItem for item " log.debug("skipping " + relationshipType.getID() + " in findRelatedItemsForLeftItem for item "
+ item.getID()); + item.getID() + " because no relevant virtual metadata was found");
} }
} }
return itemsToUpdate;
} }
/** /**
* Converts virtual metadata from RelationshipMetadataValue objects to actual item metadata. * Converts virtual metadata from RelationshipMetadataValue objects to actual item metadata.