hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-13 13:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-3817: Support the DSpace Cover page functionality in the bitstream content endpoint

Browse Source
This commit is contained in:
Yana De Pauw
2018-01-29 15:01:29 +01:00
parent 04dd484357
commit 028e72d1b6
5 changed files with 178 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dspace-api/src/main/java/org/dspace/curate/CitationPage.java
View File

@@ -7,6 +7,7 @@
*/
package org.dspace.curate;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.log4j.Logger;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.*;
@@ -150,9 +151,9 @@ public class CitationPage extends AbstractCurationTask {
+ bitstream.getName() + " is citable.");
try {
//Create the cited document
File citedDocument = citationDocument.makeCitedDocument(Curator.curationContext(), bitstream);
Pair<InputStream, Long> citedDocument = citationDocument.makeCitedDocument(Curator.curationContext(), bitstream);
//Add the cited document to the approiate bundle
this.addCitedPageToItem(citedDocument, bundle, pBundle,
this.addCitedPageToItem(citedDocument.getKey(), bundle, pBundle,
dBundle, displayMap, item, bitstream);
} catch (Exception e) {
//Could be many things, but nothing that should be
@@ -187,7 +188,7 @@ public class CitationPage extends AbstractCurationTask {
* A helper function for {@link CitationPage#performItem(Item)}. This function takes in the
* cited document as a File and adds it to DSpace properly.
*
* @param citedTemp The temporary File that is the cited document.
* @param citedDoc The temporary File that is the cited document.
* @param bundle The bundle the cited file is from.
* @param pBundle The preservation bundle. The original document should be
* put in here if it is not already.
@@ -200,7 +201,7 @@ public class CitationPage extends AbstractCurationTask {
* @throws AuthorizeException if authorization error
* @throws IOException if IO error
*/
protected void addCitedPageToItem(File citedTemp, Bundle bundle, Bundle pBundle,
protected void addCitedPageToItem(InputStream citedDoc, Bundle bundle, Bundle pBundle,
Bundle dBundle, Map<String,Bitstream> displayMap, Item item,
Bitstream bitstream) throws SQLException, AuthorizeException, IOException {
//If we are modifying a file that is not in the
@@ -218,12 +219,11 @@ public class CitationPage extends AbstractCurationTask {
//Create an input stream form the temporary file
//that is the cited document and create a
//bitstream from it.
InputStream inp = new FileInputStream(citedTemp);
if (displayMap.containsKey(bitstream.getName())) {
bundleService.removeBitstream(context, dBundle, displayMap.get(bitstream.getName()));
}
Bitstream citedBitstream = bitstreamService.create(context, dBundle, inp);
inp.close(); //Close up the temporary InputStream
Bitstream citedBitstream = bitstreamService.create(context, dBundle, citedDoc);
citedDoc.close(); //Close up the temporary InputStream
//Setup a good name for our bitstream and make
//it the same format as the source document.