hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DSpace Import to accept zip, adding subfolder to sourceDir

Browse Source
This commit is contained in:
Peter Dietz
2014-07-21 15:06:39 -04:00
parent d288e5851e
commit 63e960b785
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
View File

@@ -517,6 +517,7 @@ public class ItemImport
// If this is a zip archive, unzip it first // If this is a zip archive, unzip it first
if (zip) if (zip)
{ {
String sourceDirForZip = sourcedir;
ZipFile zf = new ZipFile(zipfilename); ZipFile zf = new ZipFile(zipfilename);
ZipEntry entry; ZipEntry entry;
Enumeration<? extends ZipEntry> entries = zf.entries(); Enumeration<? extends ZipEntry> entries = zf.entries();
@@ -546,6 +547,17 @@ public class ItemImport
{ {
log.error("Unable to create directory"); log.error("Unable to create directory");
} }
//Entries could have too many directories, and we need to adjust the sourcedir
//regex supports either windows or *nix file paths
String[] entryChunks = entry.getName().split("/|\\\\");
if(entryChunks.length > 1) {
if(sourceDirForZip == sourcedir) {
sourceDirForZip += "/" + entryChunks[0];
}
}
} }
byte[] buffer = new byte[1024]; byte[] buffer = new byte[1024];
int len; int len;
@@ -560,6 +572,11 @@ public class ItemImport
out.close(); out.close();
} }
} }
if(sourceDirForZip != sourcedir) {
sourcedir = sourceDirForZip;
System.out.println("Set sourceDir using path inside of Zip: " + sourcedir);
}
} }
c.turnOffAuthorisationSystem(); c.turnOffAuthorisationSystem();