CHANGELOG.md: Add notes about new common names

After my merge request to Debian's iso-codes package was merged we
now no longer need to maintain local overrides for Iran, Laos, and
Syria, as those are officially in iso-codes.

See: https://salsa.debian.org/iso-codes-team/iso-codes/-/merge_requests/32

.github/workflows/maven.yml

@@ -12,13 +12,15 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
-    - name: Set up JDK 1.8
+    - name: Set up JDK 8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 8
+        distribution: 'temurin'
+        cache: 'maven'
     - name: Build with Maven
       run: mvn -B package --file pom.xml

CHANGELOG.md

@@ -6,10 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 ### Updated
+- `iso_3166-1.json` from iso-codes 4.13.0-SNAPSHOT, which [adds common names for Iran, Laos, and Syria](https://salsa.debian.org/iso-codes-team/iso-codes/-/merge_requests/32)
+
+## [6.2] - 2023-02-20
+### Updated
+- `iso_3166-1.json` from iso-codes 4.12.0, which updates the name for TR to "Türkiye"
+
+## [6.1] - 2022-10-31
+### Updated
 - Update dependencies in `pom.xml`
+- `iso_3166-1.json` from iso-codes 4.11.0
 
 ### Changed
 - Java compiler and target from JDK 7 to JDK 8
 
 ### Added
 - New `FixLowQualityThumbnails` script to detect and remove more low-quality thumbnails
+
+### Fixed
+- `FixJpgJpgThumbnails` and `FixLowQualityThumbnails` scripts not commiting changes when operating on a site, community, or collection

README.md

@@ -5,7 +5,7 @@ DSpace curation tasks and other Java-based helpers used on the [CGSpace](https:/
 - **FixJpgJpgThumbnails**: fix low-quality ".jpg.jpg" thumbnails by replacing them with their originals
 - **FixLowQualityThumbnails**: remove low-quality thumbnails when PDF bitstreams are present
 
-Tested on DSpace 6.3. Read more about the [DSpace curation system](https://wiki.lyrasis.org/display/DSDOC5x/Curation+System).
+Tested on DSpace 6.3. Read more about the [DSpace curation system](https://wiki.lyrasis.org/display/DSDOC6x/Curation+System).
 
 ## Build and Install
 
@@ -16,7 +16,7 @@ To use these curation tasks in a DSpace project add the following dependency to
 <dependency>
   <groupId>io.github.ilri.cgspace</groupId>
   <artifactId>cgspace-java-helpers</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>6.2-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -32,7 +32,7 @@ $ mvn package
 Copy the resulting jar to the DSpace `lib` directory:
 
 ```console
-$ cp target/cgspace-java-helpers-6.1-SNAPSHOT.jar ~/dspace/lib/
+$ cp target/cgspace-java-helpers-6.2-SNAPSHOT.jar ~/dspace/lib/
 ```
 
 ## Configuration
@@ -44,6 +44,8 @@ Please refer to the appropriate README.md file:
 ## TODO
 
 - Add a curation task to normalize DOIs to "https://doi.org" format
+- Migrate from maven-deploy-plugin to nexus-staging-maven-plugin, see: https://central.sonatype.org/publish/publish-maven/#nexus-staging-maven-plugin-for-deployment-and-release
+- Stop using oss-parent, see: https://central.sonatype.org/publish/publish-maven/#create-a-ticket-with-sonatype
 
 ## Notes
 This project was initially created according to the [Maven Getting Started Guide](https://maven.apache.org/guides/getting-started/):
@@ -52,6 +54,14 @@ This project was initially created according to the [Maven Getting Started Guide
 $ mvn -B archetype:generate -DgroupId=io.github.ilri.cgspace -DartifactId=cgspace-java-helpers -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4
 ```
 
+To deploy a new `-SNAPSHOT` release to Maven Central (make sure OSSHRH credentials are in `~/.m2/settings.xml`):
+
+```console
+$ mvn clean deploy
+```
+
+See: <a href="https://central.sonatype.org/publish/publish-maven/#performing-a-snapshot-deployment">Performing a Snapshot Deployment</a>
+
 ## License
 This work is licensed under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
 

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>io.github.ilri.cgspace</groupId>
   <artifactId>cgspace-java-helpers</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>6.2-SNAPSHOT</version>
 
   <name>cgspace-java-helpers</name>
   <url>https://github.com/ilri/cgspace-java-helpers</url>
@@ -94,7 +94,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.0.0</version>
         </plugin>
         <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
         <plugin>

src/main/java/io/github/ilri/cgspace/ctasks/CountriesVocabulary.java

@@ -19,7 +19,8 @@ public class CountriesVocabulary {
         private String alpha_2; // required
         private String alpha_3; // required
 
-        public Country(String name,
+        public Country(
+                String name,
                 @Nullable String common_name,
                 @Nullable String official_name,
                 @Nullable String cgspace_name,
@@ -30,7 +31,9 @@ public class CountriesVocabulary {
             this.common_name = common_name;
             this.official_name = official_name;
             this.cgspace_name = cgspace_name;
-            this.numeric = numeric; // fuuuuu this is a string and we can't cast to Integer because some values are zeropadded like "004"
+            this.numeric =
+                    numeric; // fuuuuu this is a string and we can't cast to Integer because some
+                             // values are zeropadded like "004"
             this.alpha_2 = alpha_2;
             this.alpha_3 = alpha_3;
         }

src/main/java/io/github/ilri/cgspace/ctasks/CountryCodeTagger.java

@@ -7,6 +7,7 @@
 package io.github.ilri.cgspace.ctasks;
 
 import com.google.gson.Gson;
+
 import org.apache.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
@@ -23,11 +24,11 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CountryCodeTagger extends AbstractCurationTask
+public class CountryCodeTagger extends AbstractCurationTask {
-{
     public class CountryCodeTaggerConfig {
         private final String isocodesJsonPath = "/io/github/ilri/cgspace/ctasks/iso_3166-1.json";
-        private final String cgspaceCountriesJsonPath = "/io/github/ilri/cgspace/ctasks/cgspace-countries.json";
+        private final String cgspaceCountriesJsonPath =
+                "/io/github/ilri/cgspace/ctasks/cgspace-countries.json";
         private final String iso3166Field = taskProperty("iso3166.field");
         private final String iso3166Alpha2Field = taskProperty("iso3166-alpha2.field");
         private final boolean forceupdate = taskBooleanProperty("forceupdate", false);
@@ -57,13 +58,11 @@ public class CountryCodeTagger extends AbstractCurationTask
     }
 
     @Override
-    public int perform(DSpaceObject dso) throws IOException
+    public int perform(DSpaceObject dso) throws IOException {
-    {
         // gotta define this here so we can access it after the if context...
         CountryCodeTaggerResult alpha2Result = new CountryCodeTaggerResult();
 
-		if (dso.getType() == Constants.ITEM)
+        if (dso.getType() == Constants.ITEM) {
-        {
             // Load configuration
             CountryCodeTaggerConfig config = new CountryCodeTaggerConfig();
 
@@ -82,11 +81,13 @@ public class CountryCodeTagger extends AbstractCurationTask
         return alpha2Result.getStatus();
     }
 
-    public CountryCodeTaggerResult performAlpha2(Item item, CountryCodeTaggerConfig config) throws IOException, SQLException {
+    public CountryCodeTaggerResult performAlpha2(Item item, CountryCodeTaggerConfig config)
+            throws IOException, SQLException {
         CountryCodeTaggerResult alpha2Result = new CountryCodeTaggerResult();
         String itemHandle = item.getHandle();
 
-        List<MetadataValue> itemCountries = itemService.getMetadataByMetadataString(item, config.iso3166Field);
+        List<MetadataValue> itemCountries =
+                itemService.getMetadataByMetadataString(item, config.iso3166Field);
 
         // skip items that don't have country metadata
         if (itemCountries.size() == 0) {
@@ -95,31 +96,55 @@ public class CountryCodeTagger extends AbstractCurationTask
         } else {
             Gson gson = new Gson();
 
-            // TODO: convert to try: https://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
+            // TODO: convert to try:
-            BufferedReader reader = new BufferedReader(new InputStreamReader(this.getClass().getResourceAsStream(config.isocodesJsonPath)));
+            // https://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
-            ISO3166CountriesVocabulary isocodesCountriesJson = gson.fromJson(reader, ISO3166CountriesVocabulary.class);
+            BufferedReader reader =
+                    new BufferedReader(
+                            new InputStreamReader(
+                                    this.getClass().getResourceAsStream(config.isocodesJsonPath)));
+            ISO3166CountriesVocabulary isocodesCountriesJson =
+                    gson.fromJson(reader, ISO3166CountriesVocabulary.class);
             reader.close();
 
-            reader = new BufferedReader(new InputStreamReader(this.getClass().getResourceAsStream(config.cgspaceCountriesJsonPath)));
+            reader =
-            CGSpaceCountriesVocabulary cgspaceCountriesJson = gson.fromJson(reader, CGSpaceCountriesVocabulary.class);
+                    new BufferedReader(
+                            new InputStreamReader(
+                                    this.getClass()
+                                            .getResourceAsStream(config.cgspaceCountriesJsonPath)));
+            CGSpaceCountriesVocabulary cgspaceCountriesJson =
+                    gson.fromJson(reader, CGSpaceCountriesVocabulary.class);
             reader.close();
 
-            // split the alpha2 country code field into schema, element, and qualifier so we can use it with item.addMetadata()
+            // split the alpha2 country code field into schema, element, and qualifier so we can use
+            // it with item.addMetadata()
             String[] iso3166Alpha2FieldParts = config.iso3166Alpha2Field.split("\\.");
 
             if (config.forceupdate) {
-                itemService.clearMetadata(Curator.curationContext(), item, iso3166Alpha2FieldParts[0], iso3166Alpha2FieldParts[1], iso3166Alpha2FieldParts[2], Item.ANY);
+                itemService.clearMetadata(
+                        Curator.curationContext(),
+                        item,
+                        iso3166Alpha2FieldParts[0],
+                        iso3166Alpha2FieldParts[1],
+                        iso3166Alpha2FieldParts[2],
+                        Item.ANY);
             }
 
             // check the item's country codes, if any
-            List<MetadataValue> itemAlpha2CountryCodes = itemService.getMetadataByMetadataString(item, config.iso3166Alpha2Field);
+            List<MetadataValue> itemAlpha2CountryCodes =
+                    itemService.getMetadataByMetadataString(item, config.iso3166Alpha2Field);
 
             if (itemAlpha2CountryCodes.size() == 0) {
                 List<String> newAlpha2Codes = new ArrayList<String>();
                 for (MetadataValue itemCountry : itemCountries) {
                     // check ISO 3166-1 countries
                     for (CountriesVocabulary.Country country : isocodesCountriesJson.countries) {
-                        if (itemCountry.getValue().equalsIgnoreCase(country.getName()) || itemCountry.getValue().equalsIgnoreCase(country.get_official_name()) || itemCountry.getValue().equalsIgnoreCase(country.get_common_name())) {
+                        if (itemCountry.getValue().equalsIgnoreCase(country.getName())
+                                || itemCountry
+                                        .getValue()
+                                        .equalsIgnoreCase(country.get_official_name())
+                                || itemCountry
+                                        .getValue()
+                                        .equalsIgnoreCase(country.get_common_name())) {
                             newAlpha2Codes.add(country.getAlpha_2());
                         }
                     }
@@ -134,7 +159,14 @@ public class CountryCodeTagger extends AbstractCurationTask
 
                 if (newAlpha2Codes.size() > 0) {
                     try {
-                        itemService.addMetadata(Curator.curationContext(), item, iso3166Alpha2FieldParts[0], iso3166Alpha2FieldParts[1], iso3166Alpha2FieldParts[2], "en_US", newAlpha2Codes);
+                        itemService.addMetadata(
+                                Curator.curationContext(),
+                                item,
+                                iso3166Alpha2FieldParts[0],
+                                iso3166Alpha2FieldParts[1],
+                                iso3166Alpha2FieldParts[2],
+                                "en_US",
+                                newAlpha2Codes);
                         itemService.update(Curator.curationContext(), item);
                     } catch (SQLException | AuthorizeException sqle) {
                         config.log.debug(sqle.getMessage());
@@ -142,7 +174,11 @@ public class CountryCodeTagger extends AbstractCurationTask
                         alpha2Result.setStatus(Curator.CURATE_ERROR);
                     }
 
-                    alpha2Result.setResult(itemHandle + ": added " + newAlpha2Codes.size() + " alpha2 country code(s)");
+                    alpha2Result.setResult(
+                            itemHandle
+                                    + ": added "
+                                    + newAlpha2Codes.size()
+                                    + " alpha2 country code(s)");
                 } else {
                     alpha2Result.setResult(itemHandle + ": no matching countries found");
                 }

src/main/java/io/github/ilri/cgspace/ctasks/ISO3166CountriesVocabulary.java

@@ -7,9 +7,12 @@
 package io.github.ilri.cgspace.ctasks;
 
 import com.google.gson.annotations.SerializedName;
+
 import java.util.List;
 
 public class ISO3166CountriesVocabulary extends CountriesVocabulary {
-    // support reading iso_3166-1.json from Debian's iso-codes package using SerializedName since our class needs to match the JSON exactly
+    // support reading iso_3166-1.json from Debian's iso-codes package using SerializedName since
-    @SerializedName("3166-1") List<Country> countries;
+    // our class needs to match the JSON exactly
+    @SerializedName("3166-1")
+    List<Country> countries;
 }

src/main/java/io/github/ilri/cgspace/ctasks/README.md

@@ -14,7 +14,7 @@ To use these curation tasks in a DSpace project add the following dependency to
 <dependency>
   <groupId>io.github.ilri.cgspace</groupId>
   <artifactId>cgspace-java-helpers</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>6.2-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -30,7 +30,7 @@ $ mvn package
 Copy the resulting jar to the DSpace `lib` directory:
 
 ```
-$ cp target/cgspace-java-helpers-6.1-SNAPSHOT.jar ~/dspace/lib/
+$ cp target/cgspace-java-helpers-6.2-SNAPSHOT.jar ~/dspace/lib/
 ```
 
 ## Configuration

src/main/java/io/github/ilri/cgspace/scripts/FixJpgJpgThumbnails.java

@@ -8,14 +8,20 @@ package io.github.ilri.cgspace.scripts;
 
 import org.apache.commons.lang.StringUtils;
 import org.dspace.authorize.AuthorizeException;
-import org.dspace.content.*;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.BundleService;
+import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.ItemService;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
-import org.dspace.content.service.BundleService;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -31,8 +37,10 @@ import java.util.List;
 public class FixJpgJpgThumbnails {
     // note: static members belong to the class itself, not any one instance
     public static ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-	public static HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
+    public static HandleService handleService =
-	public static BundleService bundleService = ContentServiceFactory.getInstance().getBundleService();
+            HandleServiceFactory.getInstance().getHandleService();
+    public static BundleService bundleService =
+            ContentServiceFactory.getInstance().getBundleService();
 
     public static void main(String[] args) {
         String parentHandle = null;
@@ -51,17 +59,24 @@ public class FixJpgJpgThumbnails {
                 DSpaceObject parent = handleService.resolveToObject(context, parentHandle);
                 if (parent != null) {
                     switch (parent.getType()) {
-						case Constants.COLLECTION:
+                        case Constants.SITE:
-							process(context, itemService.findByCollection(context, (Collection) parent));
+                            process(context, itemService.findAll(context));
+                            context.commit();
                             break;
                         case Constants.COMMUNITY:
                             List<Collection> collections = ((Community) parent).getCollections();
                             for (Collection collection : collections) {
-								process(context, itemService.findAllByCollection(context, collection));
+                                process(
+                                        context,
+                                        itemService.findAllByCollection(context, collection));
                             }
+                            context.commit();
                             break;
-						case Constants.SITE:
+                        case Constants.COLLECTION:
-							process(context, itemService.findAll(context));
+                            process(
+                                    context,
+                                    itemService.findByCollection(context, (Collection) parent));
+                            context.commit();
                             break;
                         case Constants.ITEM:
                             processItem(context, (Item) parent);
@@ -79,7 +94,8 @@ public class FixJpgJpgThumbnails {
         }
     }
 
-	private static void process(Context context, Iterator<Item> items) throws SQLException, IOException, AuthorizeException {
+    private static void process(Context context, Iterator<Item> items)
+            throws SQLException, IOException, AuthorizeException {
         while (items.hasNext()) {
             Item item = items.next();
             processItem(context, item);
@@ -87,14 +103,18 @@ public class FixJpgJpgThumbnails {
         }
     }
 
-	private static void processItem(Context context, Item item) throws SQLException, AuthorizeException, IOException {
+    private static void processItem(Context context, Item item)
-		// Some bitstreams like Infographics are large JPGs and put in the ORIGINAL bundle on purpose so we shouldn't
+            throws SQLException, AuthorizeException, IOException {
+        // Some bitstreams like Infographics and Maps are large JPEGs and put in the ORIGINAL bundle
+        // on purpose so we shouldn't
         // swap them.
-		List<MetadataValue> itemTypes = itemService.getMetadataByMetadataString(item, "dcterms.type");
+        List<MetadataValue> itemTypes =
-		boolean itemHasInfographic = false;
+                itemService.getMetadataByMetadataString(item, "dcterms.type");
         for (MetadataValue itemType : itemTypes) {
-			if (itemType.getValue().equals("Infographic")) {
+            if (itemType.getValue().equals("Infographic") || itemType.getValue().equals("Map")) {
-				itemHasInfographic = true;
+                System.out.println(
+                        item.getHandle() + ": item has an Infographic or Map, skipping.");
+                return;
             }
         }
 
@@ -103,6 +123,12 @@ public class FixJpgJpgThumbnails {
             List<Bitstream> thumbnailBundleBitstreams = thumbnailBundle.getBitstreams();
             for (Bitstream thumbnailBitstream : thumbnailBundleBitstreams) {
                 String thumbnailName = thumbnailBitstream.getName();
+                String thumbnailDescription = thumbnailBitstream.getDescription();
+
+                // There is no point continuing if the thumbnail's description is empty or null
+                if (StringUtils.isEmpty(thumbnailDescription)) {
+                    continue;
+                }
 
                 if (thumbnailName.toLowerCase().contains(".jpg.jpg")) {
                     List<Bundle> originalBundles = item.getBundles("ORIGINAL");
@@ -117,21 +143,25 @@ public class FixJpgJpgThumbnails {
                             /*
                             - check if the original file name is the same as the thumbnail name minus the extra ".jpg"
                             - check if the thumbnail description indicates it was automatically generated
-							- check if the item has dc.type Infographic (JPG could be the "real" item!)
                             - check if the original bitstream is less than ~100KiB
                                 - Note: in my tests there were 4022 items with ".jpg.jpg" thumbnails totaling 394549249
                                   bytes for an average of about 98KiB so ~100KiB seems like a good cut off
                             */
-							if (
+                            if (originalName.equalsIgnoreCase(
-									originalName.equalsIgnoreCase(StringUtils.removeEndIgnoreCase(thumbnailName, ".jpg"))
+                                            StringUtils.removeEndIgnoreCase(thumbnailName, ".jpg"))
-									&& ("Generated Thumbnail".equals(thumbnailBitstream.getDescription()) || "IM Thumbnail".equals(thumbnailBitstream.getDescription()))
+                                    && ("Generated Thumbnail".equals(thumbnailDescription)
-									&& !itemHasInfographic
+                                            || "IM Thumbnail".equals(thumbnailDescription))
-									&& originalBitstreamBytes < 100000
+                                    && originalBitstreamBytes < 100000) {
-							) {
+                                System.out.println(
-								System.out.println(item.getHandle() + ": replacing " + thumbnailName + " with " + originalName);
+                                        item.getHandle()
+                                                + ": replacing "
+                                                + thumbnailName
+                                                + " with "
+                                                + originalName);
 
                                 // add the original bitstream to the THUMBNAIL bundle
-								bundleService.addBitstream(context, thumbnailBundle, originalBitstream);
+                                bundleService.addBitstream(
+                                        context, thumbnailBundle, originalBitstream);
                                 // remove the original bitstream from the ORIGINAL bundle
                                 originalBundle.removeBitstream(originalBitstream);
                                 // remove the JpgJpg bitstream from the THUMBNAIL bundle

src/main/java/io/github/ilri/cgspace/scripts/FixLowQualityThumbnails.java

@@ -8,7 +8,12 @@ package io.github.ilri.cgspace.scripts;
 
 import org.apache.commons.lang.StringUtils;
 import org.dspace.authorize.AuthorizeException;
-import org.dspace.content.*;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
@@ -71,10 +76,9 @@ public class FixLowQualityThumbnails {
                 DSpaceObject parent = handleService.resolveToObject(context, parentHandle);
                 if (parent != null) {
                     switch (parent.getType()) {
-                        case Constants.COLLECTION:
+                        case Constants.SITE:
-                            process(
+                            process(context, itemService.findAll(context));
-                                    context,
+                            context.commit();
-                                    itemService.findByCollection(context, (Collection) parent));
                             break;
                         case Constants.COMMUNITY:
                             List<Collection> collections = ((Community) parent).getCollections();
@@ -83,9 +87,13 @@ public class FixLowQualityThumbnails {
                                         context,
                                         itemService.findAllByCollection(context, collection));
                             }
+                            context.commit();
                             break;
-                        case Constants.SITE:
+                        case Constants.COLLECTION:
-                            process(context, itemService.findAll(context));
+                            process(
+                                    context,
+                                    itemService.findByCollection(context, (Collection) parent));
+                            context.commit();
                             break;
                         case Constants.ITEM:
                             processItem(context, (Item) parent);
@@ -114,6 +122,8 @@ public class FixLowQualityThumbnails {
 
     private static void processItem(Context context, Item item)
             throws SQLException, AuthorizeException, IOException {
+        System.out.println("FixLowQualityThumbnails: processing item: " + item.getHandle());
+
         // Set some state for the item before we iterate over the THUMBNAIL bundle
         boolean itemHasImThumbnail = false;
 
@@ -154,7 +164,7 @@ public class FixLowQualityThumbnails {
                     // ption will *always* be "Generated Thumbnail".
                     if ("Generated Thumbnail".equals(thumbnailDescription)) {
                         System.out.print("\u001b[33m");
-                        System.out.println("Deleting (" + item.getHandle() + "):");
+                        System.out.println("> Action: remove old thumbnail from THUMBNAIL bundle");
                         System.out.println("> Name: »" + thumbnailName + "«");
                         System.out.println("> Description: »" + thumbnailDescription + "«");
                         System.out.print("\u001b[0m");
@@ -168,7 +178,7 @@ public class FixLowQualityThumbnails {
                     } else if (thumbnailDescription.toLowerCase().contains("thumbnail")
                             && !"IM Thumbnail".equals(thumbnailDescription)) {
                         System.out.print("\u001b[33m");
-                        System.out.println("Deleting (" + item.getHandle() + "):");
+                        System.out.println("> Action: remove manually uploaded thumbnail from THUMBNAIL bundle");
                         System.out.println("> Name: »" + thumbnailName + "«");
                         System.out.println("> Description: »" + thumbnailDescription + "«");
                         System.out.print("\u001b[0m");
@@ -180,7 +190,7 @@ public class FixLowQualityThumbnails {
                         // a thumbnail for a journal or a limited access item.
                     } else {
                         System.out.print("\u001b[34m");
-                        System.out.println("Skipping (" + item.getHandle() + "):");
+                        System.out.println("> Action: skip other thumbnail in THUMBNAIL bundle");
                         System.out.println("> Name: »" + thumbnailName + "«");
                         System.out.println("> Description: »" + thumbnailDescription + "«");
                         System.out.print("\u001b[0m");
@@ -245,7 +255,7 @@ public class FixLowQualityThumbnails {
                             && (originalName.toLowerCase().contains("thumbnail")
                                     || originalDescription.toLowerCase().contains("thumbnail"))) {
                         System.out.print("\u001b[33m");
-                        System.out.println("Removing (" + item.getHandle() + "):");
+                        System.out.println("> Action: remove thumbnail from ORIGINAL bundle");
                         System.out.println("> Name: »" + originalName + "«");
                         System.out.println("> Description: »" + originalDescription + "«");
                         System.out.print("\u001b[0m");
@@ -255,7 +265,7 @@ public class FixLowQualityThumbnails {
 
                     } else {
                         System.out.print("\u001b[34m");
-                        System.out.println("Skipping (" + item.getHandle() + "):");
+                        System.out.println("> Action: skip other bitstream in ORIGINAL bundle");
                         System.out.println("> Name: »" + originalName + "«");
                         System.out.println("> Description: »" + originalDescription + "«");
                         System.out.print("\u001b[0m");

src/main/java/io/github/ilri/cgspace/scripts/README.md

@@ -15,7 +15,7 @@ To use these curation tasks in a DSpace project add the following dependency to
 <dependency>
   <groupId>io.github.ilri.cgspace</groupId>
   <artifactId>cgspace-java-helpers</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>6.2-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -31,7 +31,7 @@ $ mvn package
 Copy the resulting jar to the DSpace `lib` directory:
 
 ```console
-$ cp target/cgspace-java-helpers-6.1-SNAPSHOT.jar ~/dspace/lib/
+$ cp target/cgspace-java-helpers-6.2-SNAPSHOT.jar ~/dspace/lib/
 ```
 
 ## Invocation

src/main/resources/io/github/ilri/cgspace/ctasks/cgspace-countries.json

@@ -16,29 +16,15 @@
       "name": "Congo, The Democratic Republic of the",
       "numeric": "180"
     },
-    {
-      "alpha_2": "IR",
-      "alpha_3": "IRN",
-      "name": "Iran, Islamic Republic of",
-      "cgspace_name": "Iran",
-      "numeric": "364",
-      "official_name": "Islamic Republic of Iran"
-    },
     {
       "alpha_2": "KP",
       "alpha_3": "PRK",
+      "common_name": "North Korea",
       "name": "Korea, Democratic People's Republic of",
       "cgspace_name": "Korea, DPR",
       "numeric": "408",
       "official_name": "Democratic People's Republic of Korea"
     },
-    {
-      "alpha_2": "LA",
-      "alpha_3": "LAO",
-      "name": "Lao People's Democratic Republic",
-      "cgspace_name": "Laos",
-      "numeric": "418"
-    },
     {
       "alpha_2": "FM",
       "alpha_3": "FSM",
@@ -54,12 +40,5 @@
       "cgspace_name": "Russia",
       "numeric": "643"
     },
-    {
-      "alpha_2": "SY",
-      "alpha_3": "SYR",
-      "name": "Syrian Arab Republic",
-      "cgspace_name": "Syria",
-      "numeric": "760"
-    }
   ]
 }