annotations and excluded annotations was missing from the mipIds lookup

JaneliaSciComp · May 22, 2024 · 64fb50c · 64fb50c
1 parent fcca2ca
commit 64fb50c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...rch-persist/src/main/java/org/janelia/colormipsearch/dataio/db/DBNeuronMatchesReader.java b/...rch-persist/src/main/java/org/janelia/colormipsearch/dataio/db/DBNeuronMatchesReader.java
@@ -48,7 +48,9 @@ public List<String> listMatchesLocations(Collection<DataSourceParam> 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
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.20.0</version>
+            <version>2.23.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.20.0</version>
+            <version>2.23.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>