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

When moving metadata, make sure virtual metadata is handled correctly

Browse Source
This commit is contained in:
Ben Bosman
2020-02-18 13:29:31 +01:00
parent b8bca78e50
commit 243b0c077f
3 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
View File

@@ -677,11 +677,11 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
MetadataValue newMetadata = addMetadata(context, dso, schema, element, qualifier, MetadataValue newMetadata = addMetadata(context, dso, schema, element, qualifier,
lang, value, authority, confidence); lang, value, authority, confidence);
moveSingleMetadataValue(context, dso, schema, element, qualifier, place, newMetadata); moveSingleMetadataValue(context, dso, place, newMetadata);
place++; place++;
last = false; last = false;
} }
moveSingleMetadataValue(context, dso, schema, element, qualifier, place, rr); moveSingleMetadataValue(context, dso, place, rr);
place++; place++;
idx++; idx++;
} }
@@ -721,31 +721,30 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
boolean last = true; boolean last = true;
for (MetadataValue rr : list) { for (MetadataValue rr : list) {
if (idx == to && to < from) { if (idx == to && to < from) {
moveSingleMetadataValue(context, dso, schema, element, qualifier, place, moved); moveSingleMetadataValue(context, dso, place, moved);
place++; place++;
last = false; last = false;
} }
if (idx != from) { if (idx != from) {
moveSingleMetadataValue(context, dso, schema, element, qualifier, place, rr); moveSingleMetadataValue(context, dso, place, rr);
place++; place++;
} }
if (idx == to && to > from) { if (idx == to && to > from) {
moveSingleMetadataValue(context, dso, schema, element, qualifier, place, moved); moveSingleMetadataValue(context, dso, place, moved);
place++; place++;
last = false; last = false;
} }
idx++; idx++;
} }
if (last) { if (last) {
moveSingleMetadataValue(context, dso, schema, element, qualifier, place, moved); moveSingleMetadataValue(context, dso, place, moved);
} }
} }
/** /**
* Supports moving metadata by updating the place of the metadata value * Supports moving metadata by updating the place of the metadata value
*/ */
protected void moveSingleMetadataValue(Context context, T dso, String schema, String element, protected void moveSingleMetadataValue(Context context, T dso, int place, MetadataValue rr) {
String qualifier, int place, MetadataValue rr) throws SQLException {
//just move the metadata //just move the metadata
rr.setPlace(place); rr.setPlace(place);
} }

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

@@ -1376,8 +1376,7 @@ prevent the generation of resource policy entry values with null dspace_object a
* Supports moving metadata by adding the metadata value or updating the place of the relationship * Supports moving metadata by adding the metadata value or updating the place of the relationship
*/ */
@Override @Override
protected void moveSingleMetadataValue(Context context, Item dso, String schema, String element, protected void moveSingleMetadataValue(Context context, Item dso, int place, MetadataValue rr) {
String qualifier, int place, MetadataValue rr) throws SQLException {
if (rr instanceof RelationshipMetadataValue) { if (rr instanceof RelationshipMetadataValue) {
try { try {
//Retrieve the applicable relationship //Retrieve the applicable relationship

14
dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MetadataValueRemovePatchOperation.java
View File

@@ -8,6 +8,7 @@
package org.dspace.app.rest.submit.factory.impl; package org.dspace.app.rest.submit.factory.impl;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Arrays;
import java.util.List; import java.util.List;
import org.dspace.app.rest.model.MetadataValueRest; import org.dspace.app.rest.model.MetadataValueRest;
@@ -40,18 +41,7 @@ public abstract class MetadataValueRemovePatchOperation<DSO extends DSpaceObject
String[] metadata = Utils.tokenize(target); String[] metadata = Utils.tokenize(target);
List<MetadataValue> mm = getDSpaceObjectService().getMetadata(source, metadata[0], metadata[1], metadata[2], List<MetadataValue> mm = getDSpaceObjectService().getMetadata(source, metadata[0], metadata[1], metadata[2],
Item.ANY); Item.ANY);
getDSpaceObjectService().clearMetadata(context, source, metadata[0], metadata[1], metadata[2], Item.ANY); getDSpaceObjectService().removeMetadataValues(context, source, Arrays.asList(mm.get(index)));
if (index != -1) {
int idx = 0;
for (MetadataValue m : mm) {
if (idx != index) {
getDSpaceObjectService().addMetadata(context, source, metadata[0], metadata[1], metadata[2],
m.getLanguage(), m.getValue(), m.getAuthority(),
m.getConfidence());
}
idx++;
}
}
} }
protected abstract DSpaceObjectService<DSO> getDSpaceObjectService(); protected abstract DSpaceObjectService<DSO> getDSpaceObjectService();