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

88056: Filter relationship metadata by class instance instead of authority key

Browse Source
This commit is contained in:
Bruno Roemers
2022-03-07 14:17:26 +01:00
parent 85b2752565
commit b142601c62
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java
View File

@@ -12,7 +12,6 @@ import java.sql.SQLException;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.ResourcePolicy; import org.dspace.authorize.ResourcePolicy;
import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.AuthorizeService;
@@ -22,10 +21,10 @@ import org.dspace.content.Item;
import org.dspace.content.MetadataField; import org.dspace.content.MetadataField;
import org.dspace.content.MetadataSchema; import org.dspace.content.MetadataSchema;
import org.dspace.content.MetadataValue; import org.dspace.content.MetadataValue;
import org.dspace.content.RelationshipMetadataValue;
import org.dspace.content.service.BitstreamService; import org.dspace.content.service.BitstreamService;
import org.dspace.content.service.BundleService; import org.dspace.content.service.BundleService;
import org.dspace.content.service.ItemService; import org.dspace.content.service.ItemService;
import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.storage.bitstore.service.BitstreamStorageService; import org.dspace.storage.bitstore.service.BitstreamStorageService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -58,7 +57,7 @@ public abstract class AbstractVersionProvider {
String unqualifiedMetadataField = metadataSchema.getName() + "." + metadataField.getElement(); String unqualifiedMetadataField = metadataSchema.getName() + "." + metadataField.getElement();
if (getIgnoredMetadataFields().contains(metadataField.toString('.')) || if (getIgnoredMetadataFields().contains(metadataField.toString('.')) ||
getIgnoredMetadataFields().contains(unqualifiedMetadataField + "." + Item.ANY) || getIgnoredMetadataFields().contains(unqualifiedMetadataField + "." + Item.ANY) ||
StringUtils.startsWith(aMd.getAuthority(), Constants.VIRTUAL_AUTHORITY_PREFIX)) { aMd instanceof RelationshipMetadataValue) {
//Skip this metadata field (ignored and/or virtual) //Skip this metadata field (ignored and/or virtual)
continue; continue;
} }