Skip to content

Commit 6918cd3

Browse files
committed
cleanup
1 parent 019738f commit 6918cd3

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

src/main/java/org/tdl/vireo/controller/SubmissionController.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -691,23 +691,10 @@ private void processBatchExport(HttpServletResponse response, User user, String
691691
ZipOutputStream zos = new ZipOutputStream(sos_mets);
692692
for (Submission submission : submissionRepo.batchDynamicSubmissionQuery(filter, columns)) {
693693
ExportPackage exportPackage = packagerUtility.packageExport(packager, submission);
694-
/**
695-
if(exportPackage.isMap()){
696-
for (Map.Entry<String, File> fileEntry : ((Map<String, File>) exportPackage.getPayload()).entrySet()) {
697-
File exportFile = (File) fileEntry.getValue();
698-
byte[] fileBytes = FileUtils.readFileToByteArray(exportFile);
699-
zos.putNextEntry(new ZipEntry(fileEntry.getKey()));
700-
zos.write(fileBytes);
701-
}
702-
}else{
703-
**/
704-
File exportFile = (File) exportPackage.getPayload();
705-
byte[] fileBytes = FileUtils.readFileToByteArray(exportFile);
706-
zos.putNextEntry(new ZipEntry(exportFile.getName()));
707-
zos.write(fileBytes);
708-
/**
709-
}
710-
**/
694+
File exportFile = (File) exportPackage.getPayload();
695+
byte[] fileBytes = FileUtils.readFileToByteArray(exportFile);
696+
zos.putNextEntry(new ZipEntry(exportFile.getName()));
697+
zos.write(fileBytes);
711698
zos.closeEntry();
712699
}
713700
zos.close();

src/main/java/org/tdl/vireo/model/packager/DSpaceMetsPackager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public ZipExportPackage packageExport(Submission submission, String manifest) {
8585
}else{
8686
actionLogStr.append(",");
8787
}
88-
actionLogStr.append('"'+al.getUser().getName()+'"').append(",");
8988
actionLogStr.append('"'+al.getEntry()+'"').append(",");
9089
actionLogStr.append(al.getSubmissionStatus().getName()).append("\n");
9190
}

0 commit comments

Comments
 (0)