Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't force inclusion of referred elements in snapshot #2773

Merged
merged 1 commit into from Nov 15, 2021
Merged

Don't force inclusion of referred elements in snapshot #2773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 1 addition & 9 deletions ...stproject/workflow/handler/assetmanager/AssetManagerSnapshotWorkflowOperationHandler.java
View file
Open in desktop
Expand Up @@ -45,7 +45,6 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;

/**
* Workflow operation for taking a snapshot of a media package.
Expand Down Expand Up @@ -144,7 +143,6 @@ protected MediaPackage getMediaPackageForArchival(MediaPackage current, List<Str
// Is the element referencing anything?
MediaPackageReference reference = element.getReference();
if (reference != null) {
Map<String, String> referenceProperties = reference.getProperties();
MediaPackageElement referencedElement = mp.getElementByReference(reference);

// if we are distributing the referenced element, everything is fine. Otherwise...
Expand All @@ -165,14 +163,8 @@ protected MediaPackage getMediaPackageForArchival(MediaPackage current, List<Str
// Done. Let's cut the path but keep references to the mediapackage itself
if (reference != null && reference.getType().equals(MediaPackageReference.TYPE_MEDIAPACKAGE)) {
element.setReference(reference);
} else if (reference != null && (referenceProperties == null || referenceProperties.size() == 0)) {
element.clearReference();
} else {
// Ok, there is more to that reference than just pointing at an element. Let's keep the original,
// you never know.
removals.remove(referencedElement);
referencedElement.setURI(null);
referencedElement.setChecksum(null);
element.clearReference();
}
}
}
Expand Down
8 changes: 1 addition & 7 deletions ...mh/src/main/java/org/opencastproject/publication/oaipmh/OaiPmhPublicationServiceImpl.java
View file
Open in desktop
Expand Up @@ -935,7 +935,6 @@ private MediaPackage filterMediaPackage(
// Is the element referencing anything?
MediaPackageReference reference = element.getReference();
if (reference != null) {
Map<String, String> referenceProperties = reference.getProperties();
MediaPackageElement referencedElement = mediaPackage.getElementByReference(reference);

// if we are distributing the referenced element, everything is fine. Otherwise...
Expand All @@ -956,13 +955,8 @@ private MediaPackage filterMediaPackage(
// Done. Let's cut the path but keep references to the mediapackage itself
if (reference != null && reference.getType().equals(MediaPackageReference.TYPE_MEDIAPACKAGE)) {
element.setReference(reference);
} else if (reference != null && (referenceProperties == null || referenceProperties.size() == 0)) {
element.clearReference();
} else {
// Ok, there is more to that reference than just pointing at an element. Let's keep the original,
// you never know.
referencedElement.setURI(null);
referencedElement.setChecksum(null);
element.clearReference();
}
}
}
Expand Down