hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'w2p-133552_AIP-packager-bitstream-url-fix-7.6' into w2p-133552_AIP-packager-bitstream-url-fix-main

Browse Source
This commit is contained in:
Kristof De Langhe
2025-09-03 11:37:24 +02:00
parent 75cc1b48f4 11da562ea4
commit 636076f080
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java
View File

@@ -224,29 +224,17 @@ public class PREMISCrosswalk
// c. made-up name based on sequence ID and extension. // c. made-up name based on sequence ID and extension.
String sid = String.valueOf(bitstream.getSequenceID()); String sid = String.valueOf(bitstream.getSequenceID());
String baseUrl = configurationService.getProperty("dspace.ui.url"); String baseUrl = configurationService.getProperty("dspace.ui.url");
String handle = null;
// get handle of parent Item of this bitstream, if there is one:
List<Bundle> bn = bitstream.getBundles();
if (bn.size() > 0) {
List<Item> bi = bn.get(0).getItems();
if (bi.size() > 0) {
handle = bi.get(0).getHandle();
}
}
// get or make up name for bitstream: // get or make up name for bitstream:
String bsName = bitstream.getName(); String bsName = bitstream.getName();
if (bsName == null) { if (bsName == null) {
List<String> ext = bitstream.getFormat(context).getExtensions(); List<String> ext = bitstream.getFormat(context).getExtensions();
bsName = "bitstream_" + sid + (ext.size() > 0 ? ext.get(0) : ""); bsName = "bitstream_" + sid + (ext.size() > 0 ? ext.get(0) : "");
} }
if (handle != null && baseUrl != null) { if (baseUrl != null) {
oiv.setText(baseUrl oiv.setText(baseUrl
+ "/bitstream/" + "/bitstreams/"
+ URLEncoder.encode(handle, "UTF-8") + bitstream.getID()
+ "/" + "/download");
+ sid
+ "/"
+ URLEncoder.encode(bsName, "UTF-8"));
} else { } else {
oiv.setText(URLEncoder.encode(bsName, "UTF-8")); oiv.setText(URLEncoder.encode(bsName, "UTF-8"));
} }