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

Merge pull request #9436 from Xiqinger/main

Browse Source 
Issue-9435
This commit is contained in:
Tim Donohue
2024-05-03 11:00:25 -05:00
committed by GitHub
parent ff36610cce 214568d480
commit 5b8f491e52
7 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
View File

@@ -1959,58 +1959,57 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
try {
while (entries.hasMoreElements()) {
entry = entries.nextElement();
String entryName = entry.getName();
File outFile = new File(zipDir + entryName);
// Verify that this file/directory will be extracted into our zipDir (and not somewhere else!)
if (!outFile.toPath().normalize().startsWith(zipDir)) {
throw new IOException("Bad zip entry: '" + entryName
+ "' in file '" + zipfile.getAbsolutePath() + "'!"
+ " Cannot process this file or directory.");
}
if (entry.isDirectory()) {
if (!new File(zipDir + entry.getName()).mkdirs()) {
if (!outFile.mkdirs()) {
logError("Unable to create contents directory: " + zipDir + entry.getName());
}
} else {
String entryName = entry.getName();
File outFile = new File(zipDir + entryName);
// Verify that this file will be extracted into our zipDir (and not somewhere else!)
if (!outFile.toPath().normalize().startsWith(zipDir)) {
throw new IOException("Bad zip entry: '" + entryName
+ "' in file '" + zipfile.getAbsolutePath() + "'!"
+ " Cannot process this file.");
} else {
logInfo("Extracting file: " + entryName);
logInfo("Extracting file: " + entryName);
int index = entryName.lastIndexOf('/');
if (index == -1) {
// Was it created on Windows instead?
index = entryName.lastIndexOf('\\');
}
if (index > 0) {
File dir = new File(zipDir + entryName.substring(0, index));
if (!dir.exists() && !dir.mkdirs()) {
logError("Unable to create directory: " + dir.getAbsolutePath());
}
//Entries could have too many directories, and we need to adjust the sourcedir
// file1.zip (SimpleArchiveFormat / item1 / contents|dublin_core|...
// SimpleArchiveFormat / item2 / contents|dublin_core|...
// or
// file2.zip (item1 / contents|dublin_core|...
// item2 / contents|dublin_core|...
//regex supports either windows or *nix file paths
String[] entryChunks = entryName.split("/|\\\\");
if (entryChunks.length > 2) {
if (StringUtils.equals(sourceDirForZip, sourcedir)) {
sourceDirForZip = sourcedir + "/" + entryChunks[0];
}
}
}
byte[] buffer = new byte[1024];
int len;
InputStream in = zf.getInputStream(entry);
BufferedOutputStream out = new BufferedOutputStream(
new FileOutputStream(outFile));
while ((len = in.read(buffer)) >= 0) {
out.write(buffer, 0, len);
}
in.close();
out.close();
int index = entryName.lastIndexOf('/');
if (index == -1) {
// Was it created on Windows instead?
index = entryName.lastIndexOf('\\');
}
if (index > 0) {
File dir = new File(zipDir + entryName.substring(0, index));
if (!dir.exists() && !dir.mkdirs()) {
logError("Unable to create directory: " + dir.getAbsolutePath());
}
//Entries could have too many directories, and we need to adjust the sourcedir
// file1.zip (SimpleArchiveFormat / item1 / contents|dublin_core|...
// SimpleArchiveFormat / item2 / contents|dublin_core|...
// or
// file2.zip (item1 / contents|dublin_core|...
// item2 / contents|dublin_core|...
//regex supports either windows or *nix file paths
String[] entryChunks = entryName.split("/|\\\\");
if (entryChunks.length > 2) {
if (StringUtils.equals(sourceDirForZip, sourcedir)) {
sourceDirForZip = sourcedir + "/" + entryChunks[0];
}
}
}
byte[] buffer = new byte[1024];
int len;
InputStream in = zf.getInputStream(entry);
BufferedOutputStream out = new BufferedOutputStream(
new FileOutputStream(outFile));
while ((len = in.read(buffer)) >= 0) {
out.write(buffer, 0, len);
}
in.close();
out.close();
}
}
} finally {

13
dspace-api/src/main/java/org/dspace/app/itemupdate/DeleteBitstreamsAction.java
View File

@@ -70,16 +70,19 @@ public class DeleteBitstreamsAction extends UpdateBitstreamsAction {
}
}
if (alterProvenance) {
if (alterProvenance && !bundles.isEmpty()) {
DtoMetadata dtom = DtoMetadata.create("dc.description.provenance", "en", "");
String append = "Bitstream " + bs.getName() + " deleted on " + DCDate
.getCurrent() + "; ";
Item item = bundles.iterator().next().getItems().iterator().next();
ItemUpdate.pr("Append provenance with: " + append);
List<Item> items = bundles.iterator().next().getItems();
if (!items.isEmpty()) {
Item item = items.iterator().next();
ItemUpdate.pr("Append provenance with: " + append);
if (!isTest) {
MetadataUtilities.appendMetadata(context, item, dtom, false, append);
if (!isTest) {
MetadataUtilities.appendMetadata(context, item, dtom, false, append);
}
}
}
}

1
dspace-api/src/main/java/org/dspace/content/crosswalk/CreativeCommonsRDFStreamDisseminationCrosswalk.java
View File

@@ -59,7 +59,6 @@ public class CreativeCommonsRDFStreamDisseminationCrosswalk
Bitstream cc = creativeCommonsService.getLicenseRdfBitstream((Item) dso);
if (cc != null) {
Utils.copy(bitstreamService.retrieve(context, cc), out);
out.close();
}
}
}

1
dspace-api/src/main/java/org/dspace/content/crosswalk/CreativeCommonsTextStreamDisseminationCrosswalk.java
View File

@@ -65,7 +65,6 @@ public class CreativeCommonsTextStreamDisseminationCrosswalk
Bitstream cc = creativeCommonsService.getLicenseTextBitstream((Item) dso);
if (cc != null) {
Utils.copy(bitstreamService.retrieve(context, cc), out);
out.close();
}
}
}

1
dspace-api/src/main/java/org/dspace/content/crosswalk/LicenseStreamDisseminationCrosswalk.java
View File

@@ -57,7 +57,6 @@ public class LicenseStreamDisseminationCrosswalk
if (licenseBs != null) {
Utils.copy(bitstreamService.retrieve(context, licenseBs), out);
out.close();
}
}
}

1
dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java
View File

@@ -628,6 +628,7 @@ public abstract class AbstractMETSDisseminator
// Disseminate crosswalk output to an outputstream
ByteArrayOutputStream disseminateOutput = new ByteArrayOutputStream();
sxwalk.disseminate(context, dso, disseminateOutput);
disseminateOutput.close();
// Convert output to an inputstream, so we can write to manifest or Zip file
ByteArrayInputStream crosswalkedStream = new ByteArrayInputStream(
disseminateOutput.toByteArray());

1
dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java
View File

@@ -89,6 +89,7 @@ public class ContentGenerator implements SubscriptionGenerator<IndexableObject>
.orElseGet(() -> entityType2Disseminator.get("Item"))
.disseminate(context, item, out);
}
out.close();
return out.toString();
} catch (Exception e) {
log.error(e.getMessage(), e);