From bcf48821d94d30cee10c3c2c94b33c52b0bccdb0 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 2 Apr 2025 11:09:45 +0200
Subject: [PATCH] 119612: Fix limit not applying on export

---
 .../dspace/app/bulkedit/MetadataExportSearch.java   |  2 --
 .../content/MetadataDSpaceCsvExportServiceImpl.java | 13 ++++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearch.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearch.java
index 04c3a75ded..e4bbe335d6 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearch.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearch.java
@@ -139,8 +139,6 @@ public class MetadataExportSearch extends DSpaceRunnable<MetadataExportSearchScr
         DiscoverQuery discoverQuery =
             queryBuilder.buildQuery(context, dso, discoveryConfiguration, query, queryBuilderSearchFilters,
             "Item", 10, Long.getLong("0"), null, SortOption.DESCENDING);
-        // add configured limit
-        discoverQuery.setMaxResults(metadataDSpaceCsvExportService.getCsvExportLimit());
         handler.logDebug("creating iterator");
 
         Iterator<Item> itemIterator = searchService.iteratorSearch(context, dso, discoverQuery);
diff --git a/dspace-api/src/main/java/org/dspace/content/MetadataDSpaceCsvExportServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/MetadataDSpaceCsvExportServiceImpl.java
index 33e87a43fc..757c5d0cd5 100644
--- a/dspace-api/src/main/java/org/dspace/content/MetadataDSpaceCsvExportServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/MetadataDSpaceCsvExportServiceImpl.java
@@ -90,9 +90,11 @@ public class MetadataDSpaceCsvExportServiceImpl implements MetadataDSpaceCsvExpo
         Context.Mode originalMode = context.getCurrentMode();
         context.setMode(Context.Mode.READ_ONLY);
 
-        // Process each item
+        // Process each item until we reach the limit
+        int itemExportLimit = getCsvExportLimit();
         DSpaceCSV csv = new DSpaceCSV(exportAll);
-        while (toExport.hasNext()) {
+
+        for (int itemsAdded = 0; toExport.hasNext() && itemsAdded < itemExportLimit; itemsAdded++) {
             Item item = toExport.next();
             csv.addItem(item);
             context.uncacheEntity(item);
@@ -121,16 +123,14 @@ public class MetadataDSpaceCsvExportServiceImpl implements MetadataDSpaceCsvExpo
     private Iterator<Item> buildFromCommunity(Context context, Community community)
         throws SQLException {
         Set<Item> result = new HashSet<>();
-        int itemsAdded = 0;
 
         // Add all the collections
         List<Collection> collections = community.getCollections();
         for (Collection collection : collections) {
             // Never obtain more items than the configured limit
             Iterator<Item> items = itemService.findByCollection(context, collection, getCsvExportLimit(), 0);
-            while (itemsAdded <= getCsvExportLimit() && items.hasNext()) {
+            while (result.size() < getCsvExportLimit() && items.hasNext()) {
                 result.add(items.next());
-                itemsAdded++;
             }
         }
 
@@ -138,9 +138,8 @@ public class MetadataDSpaceCsvExportServiceImpl implements MetadataDSpaceCsvExpo
         List<Community> communities = community.getSubcommunities();
         for (Community subCommunity : communities) {
             Iterator<Item> items = buildFromCommunity(context, subCommunity);
-            while (itemsAdded <= getCsvExportLimit() && items.hasNext()) {
+            while (result.size() < getCsvExportLimit() && items.hasNext()) {
                 result.add(items.next());
-                itemsAdded++;
             }
         }