From 2263ac27e85a9c0877dcf9732fbdcdb7513dd7d5 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Thu, 6 Aug 2020 16:13:51 +0300 Subject: [PATCH] src/main/java: Handle more corner cases in FixJpgJpgThumbnails.java We should make sure we are catching .JPG and .jpg. Also, we should check for Generated Thumbnails as well as IM Thumbnail. --- .../io/github/ilri/cgspace/scripts/FixJpgJpgThumbnails.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/ilri/cgspace/scripts/FixJpgJpgThumbnails.java b/src/main/java/io/github/ilri/cgspace/scripts/FixJpgJpgThumbnails.java index d329ad5..0d09f45 100644 --- a/src/main/java/io/github/ilri/cgspace/scripts/FixJpgJpgThumbnails.java +++ b/src/main/java/io/github/ilri/cgspace/scripts/FixJpgJpgThumbnails.java @@ -79,7 +79,7 @@ public class FixJpgJpgThumbnails { for (Bitstream thumbnailBitstream : thumbnailBundleBitstreams) { String thumbnailName = thumbnailBitstream.getName(); - if (thumbnailName.contains(".jpg.jpg")) { + if (thumbnailName.toLowerCase().contains(".jpg.jpg")) { Bundle[] originalBundles = item.getBundles("ORIGINAL"); for (Bundle originalBundle : originalBundles) { Bitstream[] originalBundleBitstreams = originalBundle.getBitstreams(); @@ -88,7 +88,7 @@ public class FixJpgJpgThumbnails { String originalName = originalBitstream.getName(); //check if the original file name is the same as the thumbnail name minus the extra ".jpg" - if (originalName.equals(StringUtils.removeEndIgnoreCase(thumbnailName, ".jpg")) && "Generated Thumbnail".equals(thumbnailBitstream.getDescription())) { + if (originalName.equalsIgnoreCase(StringUtils.removeEndIgnoreCase(thumbnailName, ".jpg")) && ("Generated Thumbnail".equals(thumbnailBitstream.getDescription()) || "IM Thumbnail".equals(thumbnailBitstream.getDescription()))) { System.out.println(item.getHandle() + ": replacing " + thumbnailName + " with " + originalName); //add the original bitstream to the THUMBNAIL bundle