From 2b4a9bdcbd98f8d96334f70528adcc3fe3851587 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Wed, 11 Jul 2012 10:43:51 -0700 Subject: [PATCH] CSPACE-5386: Dealing with more MIME type issues related to JAX-RS as well as with Nuxeo image derivatives --- .../org/collectionspace/services/blob/BlobResource.java | 7 +++---- .../services/blob/nuxeo/BlobDocumentModelHandler.java | 1 + .../services/common/imaging/nuxeo/NuxeoImageUtils.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java index 7ed7b396a..19e43f1ed 100644 --- a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java +++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java @@ -259,7 +259,7 @@ public class BlobResource extends ResourceBase { Response result = null; StringBuffer mimeType = new StringBuffer(); - InputStream contentStream = getBlobContent(csid, derivativeTerm, mimeType); + InputStream contentStream = getBlobContent(csid, derivativeTerm, mimeType); Response.ResponseBuilder responseBuilder = Response.ok(contentStream, mimeType.toString()); result = responseBuilder.build(); @@ -292,12 +292,11 @@ public class BlobResource extends ResourceBase { @GET @Path("{csid}/derivatives") - public CommonList getDerivatives( - @PathParam("csid") String csid) { + public CommonList getDerivatives(@PathParam("csid") String csid) { CommonList result = null; ensureCSID(csid, READ); - try { + try { ServiceContext ctx = createServiceContext(); result = this.getDerivativeList(ctx, csid); if (result == null) { diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java index f2156b0c8..aa4bf816c 100644 --- a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java +++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java @@ -177,6 +177,7 @@ extends DocHandlerBase { String mimeType = mimeTypeBuffer.toString(); if (mimeType != null && !mimeType.isEmpty()) { // MIME type for derivatives might be different from original blobInput.setMimeType(mimeType); + blobsCommon.setMimeType(mimeType); } else { blobInput.setMimeType(blobsCommon.getMimeType()); } diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java index 641b500b4..0b1b86f83 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java @@ -852,7 +852,7 @@ public class NuxeoImageUtils { InputStream remoteStream = docBlob.getStream(); BufferedInputStream bufferedInputStream = new BufferedInputStream( remoteStream); // FIXME: REM - To improve performance, try - // BufferedInputStream(InputStream in, int size) + // BufferedInputStream(InputStream in, int size)? result.setBlobInputStream(bufferedInputStream); } -- 2.47.3