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

SF patch #1517488 Access Bitstreams in Withdrawn Items SF bug #1408373

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/trunk@1591 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Claudia Juergen
2006-09-04 12:07:12 +00:00
parent c6e5a20b15
commit 9a7155e9b5
2 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dspace/CHANGES
View File

@@ -29,6 +29,7 @@
(Claudia Juergen)
- SF patch #1514965 fixes SF bug #1505422. fix typo in SQL for item mapper
- SF patch #1516988 Deleting owner of mapped items SF bug #1196724
- SF patch #1517488 Access Bitstreams in Withdrawn Items SF bug #1408373
(Richard Jones)
- SF bug #1515075. minor build file fix to copy correct config file

54
dspace/src/org/dspace/app/webui/servlet/BitstreamServlet.java
View File

@@ -77,6 +77,7 @@ public class BitstreamServlet extends DSpaceServlet
SQLException, AuthorizeException
{
Bitstream bitstream = null;
boolean isWithdrawn = false;
// Get the ID from the URL
String idString = request.getPathInfo();
@@ -121,7 +122,7 @@ public class BitstreamServlet extends DSpaceServlet
{
Item item = (Item) HandleManager.resolveToObject(context,
handle);
if (item == null)
{
log.info(LogManager.getHeader(context, "invalid_id",
@@ -131,6 +132,9 @@ public class BitstreamServlet extends DSpaceServlet
return;
}
// determine whether the item the bitstream belongs to has been withdrawn
isWithdrawn = item.isWithdrawn();
int sid = Integer.parseInt(sequence);
boolean found = false;
@@ -156,35 +160,45 @@ public class BitstreamServlet extends DSpaceServlet
// Invalid ID - this will be dealt with below
}
}
// Did we get a bitstream?
if (bitstream != null)
if (!isWithdrawn)
{
log.info(LogManager.getHeader(context, "view_bitstream",
// Did we get a bitstream?
if (bitstream != null)
{
log.info(LogManager.getHeader(context, "view_bitstream",
"bitstream_id=" + bitstream.getID()));
// Set the response MIME type
response.setContentType(bitstream.getFormat().getMIMEType());
// Set the response MIME type
response.setContentType(bitstream.getFormat().getMIMEType());
// Response length
response.setHeader("Content-Length", String.valueOf(bitstream
// Response length
response.setHeader("Content-Length", String.valueOf(bitstream
.getSize()));
// Pipe the bits
InputStream is = bitstream.retrieve();
// Pipe the bits
InputStream is = bitstream.retrieve();
Utils.bufferedCopy(is, response.getOutputStream());
is.close();
response.getOutputStream().flush();
Utils.bufferedCopy(is, response.getOutputStream());
is.close();
response.getOutputStream().flush();
}
// display the tombstone instead of the bitstream if the item is withdrawn
else
{
// No bitstream - we got an invalid ID
log.info(LogManager.getHeader(context, "view_bitstream",
"invalid_bitstream_id=" + idString));
JSPManager.showInvalidIDError(request, response, idString,
Constants.BITSTREAM);
}
}
else
{
// No bitstream - we got an invalid ID
log.info(LogManager.getHeader(context, "view_bitstream",
"invalid_bitstream_id=" + idString));
JSPManager.showInvalidIDError(request, response, idString,
Constants.BITSTREAM);
log.info(LogManager.getHeader(context, "view_bitstream", "item has been withdrawn"));
JSPManager.showJSP(request, response, "/tombstone.jsp");
}
}
}