diff --git a/README_SETUP.md b/README_SETUP.md index 81816e3c9cc43b9ed8de47bba5a3e8202a8cfa35..3cde99c9fc82a57524fc6e7d31d88353deeec221 100644 --- a/README_SETUP.md +++ b/README_SETUP.md @@ -118,7 +118,7 @@ server: - `INSERT_FILES_IN_DIR_ALLOWED_DIRS`: add mounted filesystems here that shall be accessible by CaosDB * Maybe set another `SESSION_TIMEOUT_MS`. - * See also [README_CONFIGURATION.md](README_CONFIGURATION.md) + * See also [CONFIGURATION.rst](https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/blob/dev/src/doc/administration/configuration.rst) 6. Copy `conf/core/usersources.ini.template` to `conf/ext/usersources.ini`. * You can skip this if you do not want to use an external authentication. Local users (CaosDB realm) are always available. diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java index 43db024be5c7759423e6ab2b86f792e798a2841c..4a334ca1f4a175915e21ef62b69672040eb944cf 100644 --- a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java +++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java @@ -244,8 +244,8 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa final Retrieve transaction = new Retrieve(container); transaction.execute(); - if (container.getFlags().containsKey("_isCount")) { - final int count = Integer.parseInt(container.getFlags().get("_isCount")); + if (container.getFlags().containsKey("query_count_result")) { + final int count = Integer.parseInt(container.getFlags().get("query_count_result")); builder .addResponsesBuilder() .setRetrieveResponse(RetrieveResponse.newBuilder().setCountResult(count)); 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 31bedc97dfacb80cbfd5aeba4afa9f99a7779724..f11523df384177e2e92dfe0924faf132ac7827fb 100644 --- a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java +++ b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java @@ -54,7 +54,9 @@ public class ExecuteQuery extends FlagJob { } getContainer().addMessage(queryInstance); if (queryInstance.getQuery().getType() == Type.COUNT) { - getContainer().getFlags().put("count", Integer.toString(queryInstance.getCount())); + getContainer() + .getFlags() + .put("query_count_result", Integer.toString(queryInstance.getCount())); } for (final EntityInterface entity : getContainer()) { getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction()));