From 39298006fb0b74183d16b3acfec6d6c848ab3e8c Mon Sep 17 00:00:00 2001 From: Michael Spalti Date: Sat, 4 Sep 2021 17:34:12 -0700 Subject: [PATCH] Reverted manifest thumbnail image. --- .../dspace/app/rest/iiif/service/ManifestService.java | 10 +++++----- .../org/dspace/app/rest/iiif/IIIFRestRepositoryIT.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/iiif/service/ManifestService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/iiif/service/ManifestService.java index c13d0fee8f..18591c9a8f 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/iiif/service/ManifestService.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/iiif/service/ManifestService.java @@ -99,7 +99,7 @@ public class ManifestService extends AbstractResourceService { // images in the ORIGINAL bundle will be used. List bundles = utils.getIiifBundle(item, IIIF_BUNDLE); List bitstreams = utils.getBitstreams(bundles); - List thumbnailBundle = utils.getBundle(item, "THUMBNAIL"); + // List thumbnailBundle = utils.getBundle(item, "THUMBNAIL"); Info info = utils.validateInfoForManifest(utils.getInfo(context, item, IIIF_BUNDLE), bitstreams); manifestGenerator.setIdentifier(getManifestId(item.getID())); manifestGenerator.setLabel(item.getName()); @@ -108,7 +108,7 @@ public class ManifestService extends AbstractResourceService { addSearchService(item); addMetadata(item.getMetadata()); addViewingHint(bitstreams.size()); - addThumbnail(thumbnailBundle, context); + addThumbnail(bundles, context); addSequence(item, bitstreams, context, info); addRanges(info, item.getID().toString()); addSeeAlso(item); @@ -223,9 +223,9 @@ public class ManifestService extends AbstractResourceService { } /** - * Adds thumbnail to the manifest. Uses the thumbnail in DSpace thumbnail bundle. - * @param bundles contain the THUMBNAIL bundle - * @param context DSpac context + * Adds thumbnail to the manifest. Uses first image in bundle. + * @param bundles image bundles + * @param context DSpace context */ private void addThumbnail(List bundles, Context context) { List bitstreams = utils.getBitstreams(bundles); diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFRestRepositoryIT.java index c165c435d4..d06eb8d266 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFRestRepositoryIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFRestRepositoryIT.java @@ -105,7 +105,7 @@ public class IIIFRestRepositoryIT extends AbstractControllerIntegrationTest { try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) { bitstream2 = BitstreamBuilder - .createBitstream(context, publicItem1, is, "THUMBNAIL") + .createBitstream(context, publicItem1, is, IIIFBundle) .withName("Bitstream2") .withMimeType("image/jpeg") .build(); @@ -119,7 +119,7 @@ public class IIIFRestRepositoryIT extends AbstractControllerIntegrationTest { .andExpect(jsonPath("$.@context", is("http://iiif.io/api/presentation/2/context.json"))) .andExpect(jsonPath("$.service.profile", is("http://iiif.io/api/search/0/search"))) .andExpect(jsonPath("$.thumbnail.@id", Matchers.containsString("/iiif/2/" - + bitstream2.getID()))) + + bitstream1.getID()))) .andExpect(jsonPath("$.sequences[0].canvases[0].@id", Matchers.containsString("/iiif/" + publicItem1.getID() + "/canvas/c0"))) .andExpect(jsonPath("$.sequences[0].canvases[0].label", is("Page 1")))