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

Applied community feedback

Browse Source
This commit is contained in:
Raf Ponsaerts
2018-12-07 16:09:29 +01:00
parent 7d07a1e6f9
commit 6e16a3ed62
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -1317,7 +1317,7 @@ prevent the generation of resource policy entry values with null dspace_object a
}
@Override
public List<MetadataValue> getRelationshipMetadata(Item item, boolean extra) {
public List<MetadataValue> getRelationshipMetadata(Item item, boolean enableVirtualMetadata) {
Context context = new Context();
List<MetadataValue> fullMetadataValueList = new LinkedList<>();
try {
@@ -1326,7 +1326,8 @@ prevent the generation of resource policy entry values with null dspace_object a
if (StringUtils.isNotBlank(entityType)) {
List<Relationship> relationships = relationshipService.findByItem(context, item);
for (Relationship relationship : relationships) {
fullMetadataValueList.addAll(handleItemRelationship(item, entityType, relationship, extra));
fullMetadataValueList.addAll(handleItemRelationship(item, entityType,
relationship, enableVirtualMetadata));
}
}
@@ -1337,7 +1338,7 @@ prevent the generation of resource policy entry values with null dspace_object a
}
private List<MetadataValue> handleItemRelationship(Item item, String entityType,
Relationship relationship, boolean extra) {
Relationship relationship, boolean enableVirtualMetadata) {
List<MetadataValue> resultingMetadataValueList = new LinkedList<>();
RelationshipType relationshipType = relationship.getRelationshipType();
HashMap<String, List<String>> hashMaps = new HashMap<>();
@@ -1355,7 +1356,7 @@ prevent the generation of resource policy entry values with null dspace_object a
relationName = relationship.getRelationshipType().getRightLabel();
}
if (hashMaps != null && extra) {
if (hashMaps != null && enableVirtualMetadata) {
resultingMetadataValueList.addAll(handleRelationshipTypeMetadataMappping(item, hashMaps,
otherItem, relationName));
}