alanorth/cgspace-java-helpers
1
0
Fork 0
mirror of https://github.com/ilri/cgspace-java-helpers.git synced 2025-05-12 16:16:08 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: alanorth:v5.1
Branches Tags
alanorth:dspace7 alanorth:dspace6 alanorth:dspace5 alanorth:master
alanorth:v7.6.1.3 alanorth:v7.6.1.2 alanorth:v7.6.1.1 alanorth:v7.6.1 alanorth:v7.6 alanorth:v6.2 alanorth:v6.1 alanorth:v6.0 alanorth:v5.3 alanorth:v5.2 alanorth:v5.1
...
compare: alanorth:v5.2
Branches Tags
alanorth:dspace7 alanorth:dspace6 alanorth:dspace5 alanorth:master
alanorth:v7.6.1.3 alanorth:v7.6.1.2 alanorth:v7.6.1.1 alanorth:v7.6.1 alanorth:v7.6 alanorth:v6.2 alanorth:v6.1 alanorth:v6.0 alanorth:v5.3 alanorth:v5.2 alanorth:v5.1

4 Commits
v5.1 ... v5.2

Author SHA1 Message Date
Alan Orth
fd893d8c4e pom.xml: Release version 5.2 2020-08-06 16:16:13 +03:00
Alan Orth
2263ac27e8 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.
 2020-08-06 16:13:51 +03:00
Alan Orth
cf7012d698 pom.xml: Change version to 5.2-SNAPSHOT 2020-08-06 16:13:27 +03:00
Alan Orth
7edc60e6ca README.md: Use badge for dspace5 branch 2020-08-06 15:47:33 +03:00
3 changed files with 4 additions and 4 deletions
Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
# CGSpace Java Helpers [![Build Status](https://travis-ci.org/ilri/cgspace-java-helpers.svg?branch=master)](https://travis-ci.org/ilri/dspace-curation-tasks) # CGSpace Java Helpers [![Build Status](https://travis-ci.org/ilri/cgspace-java-helpers.svg?branch=dspace5)](https://travis-ci.org/ilri/dspace-curation-tasks)
DSpace curation tasks and other Java-based helpers used on the [CGSpace](https://cgspace.cgiar.org) institutional repository: DSpace curation tasks and other Java-based helpers used on the [CGSpace](https://cgspace.cgiar.org) institutional repository:
- **CountryCodeTagger**: add ISO 3166-1 Alpha2 country codes to items based on their existing country metadata - **CountryCodeTagger**: add ISO 3166-1 Alpha2 country codes to items based on their existing country metadata

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>io.github.ilri.cgspace</groupId> <groupId>io.github.ilri.cgspace</groupId>
<artifactId>cgspace-java-helpers</artifactId> <artifactId>cgspace-java-helpers</artifactId>
<version>5.1</version> <version>5.2</version>
<name>cgspace-java-helpers</name> <name>cgspace-java-helpers</name>
<url>https://github.com/ilri/cgspace-java-helpers</url> <url>https://github.com/ilri/cgspace-java-helpers</url>

4
src/main/java/io/github/ilri/cgspace/scripts/FixJpgJpgThumbnails.java
View File

@ -79,7 +79,7 @@ public class FixJpgJpgThumbnails {
for (Bitstream thumbnailBitstream : thumbnailBundleBitstreams) { for (Bitstream thumbnailBitstream : thumbnailBundleBitstreams) {
String thumbnailName = thumbnailBitstream.getName(); String thumbnailName = thumbnailBitstream.getName();
if (thumbnailName.contains(".jpg.jpg")) { if (thumbnailName.toLowerCase().contains(".jpg.jpg")) {
Bundle[] originalBundles = item.getBundles("ORIGINAL"); Bundle[] originalBundles = item.getBundles("ORIGINAL");
for (Bundle originalBundle : originalBundles) { for (Bundle originalBundle : originalBundles) {
Bitstream[] originalBundleBitstreams = originalBundle.getBitstreams(); Bitstream[] originalBundleBitstreams = originalBundle.getBitstreams();
@ -88,7 +88,7 @@ public class FixJpgJpgThumbnails {
String originalName = originalBitstream.getName(); String originalName = originalBitstream.getName();
//check if the original file name is the same as the thumbnail name minus the extra ".jpg" //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); System.out.println(item.getHandle() + ": replacing " + thumbnailName + " with " + originalName);
//add the original bitstream to the THUMBNAIL bundle //add the original bitstream to the THUMBNAIL bundle