From 64fb50c0ea7eb2d27806aec322cc3f99920f025f Mon Sep 17 00:00:00 2001 From: Cristian Goina Date: Wed, 22 May 2024 18:25:06 -0400 Subject: [PATCH] annotations and excluded annotations was missing from the mipIds lookup --- .../colormipsearch/dataio/db/DBNeuronMatchesReader.java | 4 +++- colormipsearch-tools/pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/colormipsearch-persist/src/main/java/org/janelia/colormipsearch/dataio/db/DBNeuronMatchesReader.java b/colormipsearch-persist/src/main/java/org/janelia/colormipsearch/dataio/db/DBNeuronMatchesReader.java index 2941e8a6..1d706948 100644 --- a/colormipsearch-persist/src/main/java/org/janelia/colormipsearch/dataio/db/DBNeuronMatchesReader.java +++ b/colormipsearch-persist/src/main/java/org/janelia/colormipsearch/dataio/db/DBNeuronMatchesReader.java @@ -48,7 +48,9 @@ public List listMatchesLocations(Collection matchesSour .addNames(cdMatchInput.getNames()) .addTags(cdMatchInput.getTags()) .addExcludedTags(cdMatchInput.getExcludedTags()) - .addDatasetLabels(cdMatchInput.getDatasets()), + .addDatasetLabels(cdMatchInput.getDatasets()) + .addAnnotations(cdMatchInput.getAnnotations()) + .addExcludedAnnotations(cdMatchInput.getExcludedAnnotations()), new PagedRequest() .setFirstPageOffset(cdMatchInput.getOffset()) .setPageSize(cdMatchInput.getSize()) diff --git a/colormipsearch-tools/pom.xml b/colormipsearch-tools/pom.xml index 94a0ae18..474cb882 100644 --- a/colormipsearch-tools/pom.xml +++ b/colormipsearch-tools/pom.xml @@ -38,12 +38,12 @@ org.apache.logging.log4j log4j-api - 2.20.0 + 2.23.1 org.apache.logging.log4j log4j-core - 2.20.0 + 2.23.1 org.apache.commons