diff --git a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java index 20a31e3f72429dd22bd9abe1a9eb121e6eb0bcd4..758c80f546a0f41556a861ef98612e32aafc5ce0 100644 --- a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java +++ b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java @@ -59,7 +59,9 @@ public class ExecuteQuery extends FlagJob { int index2 = getTransaction().getPagingIndex2(); int ii = 0; for (final EntityInterface entity : getContainer()) { - if (!(getTransaction() instanceof Retrieve) || (ii >= index1 && ii < index2)) { + if (!(getTransaction() instanceof Retrieve) + || !getTransaction().hasPaging() + || (ii >= index1 && ii < index2)) { getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction())); } else { entity.setEntityStatus(EntityStatus.IGNORE); diff --git a/src/main/java/org/caosdb/server/transaction/Transaction.java b/src/main/java/org/caosdb/server/transaction/Transaction.java index 2b616e995cca42c086a082d61474ebd5f3edeb1a..a9bac31c80fbd208b18cf60e66902112a0294b0a 100644 --- a/src/main/java/org/caosdb/server/transaction/Transaction.java +++ b/src/main/java/org/caosdb/server/transaction/Transaction.java @@ -62,6 +62,7 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra private final C container; private int pagingIndex1; private int pagingIndex2; + private boolean ThasPaging = false; private Access access = null; private final Schedule schedule = new Schedule(); @@ -84,7 +85,12 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra return this.container; } + public boolean hasPaging() { + return ThasPaging; + } + public void setPagingIndices(int index1, int index2) { + ThasPaging = true; pagingIndex1 = index1; pagingIndex2 = index2; }