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

Implemented the feedback

Browse Source
This commit is contained in:
Raf Ponsaerts
2018-12-13 15:45:15 +01:00
parent 314e96a6ac
commit d95c378edc
7 changed files with 103 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1375,10 +1375,12 @@ prevent the generation of resource policy entry values with null dspace_object a
String key = entry.getKey();
VirtualBean virtualBean = entry.getValue();
MetadataValue metadataValue = constructMetadataValue(key);
metadataValue = constructResultingMetadataValue(context, item, otherItem, virtualBean, metadataValue);
if (StringUtils.isNotBlank(metadataValue.getValue())) {
resultingMetadataValueList.add(metadataValue);
for (String value : virtualBean.getValues(context, otherItem)) {
MetadataValue metadataValue = constructMetadataValue(key);
metadataValue = constructResultingMetadataValue(item, value, metadataValue);
if (StringUtils.isNotBlank(metadataValue.getValue())) {
resultingMetadataValueList.add(metadataValue);
}
}
}
return resultingMetadataValueList;
@@ -1405,10 +1407,8 @@ prevent the generation of resource policy entry values with null dspace_object a
return entityType;
}
private MetadataValue constructResultingMetadataValue(Context context, Item item,
Item otherItem, VirtualBean virtualBean,
MetadataValue metadataValue) throws SQLException {
metadataValue.setValue(virtualBean.getValue(context, otherItem));
private MetadataValue constructResultingMetadataValue(Item item, String value, MetadataValue metadataValue) {
metadataValue.setValue(value);
metadataValue.setAuthority("virtual");
metadataValue.setConfidence(-1);
metadataValue.setDSpaceObject(item);