log unpublished matches

JaneliaSciComp · Dec 17, 2024 · 967ede1 · 967ede1
1 parent c30e6cc
commit 967ede1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/...ch-tools/src/main/java/org/janelia/colormipsearch/cmd/dataexport/EMCDMatchesExporter.java b/...ch-tools/src/main/java/org/janelia/colormipsearch/cmd/dataexport/EMCDMatchesExporter.java
@@ -172,10 +172,24 @@ private void runExportForMaskIds(int jobId, List<String> maskMipIds) {
                         this::updateLMNeuron,
                         indexedNeuronURLs
                 ))
-                .filter(resultMatches -> resultMatches.getKey().isPublished()) // filter out unpublished EMs
+                .filter(resultMatches -> {
+                    if (resultMatches.getKey().isUnpublished()) {
+                        LOG.warn("Ignore matches for neuron {} - it was unpublished because: {}",
+                                resultMatches.getKey(), resultMatches.getKey().getUnpublishReasons());
+                        return false;
+                    }
+                    return true;
+                }) // filter out unpublished EMs
                 .peek(resultMatches -> resultMatches.setItems(resultMatches.getItems().stream()
                         // filter out unpublished LMs
-                        .filter(m -> m.getTargetImage().isPublished())
+                        .filter(m -> {
+                            if (m.getTargetImage().isUnpublished()) {
+                                LOG.warn("Removed match {} for {} - {} was unpublished because: {}", m, resultMatches.getKey(),
+                                        m.getTargetImage(), m.getTargetImage().getUnpublishReasons());
+                                return false;
+                            }
+                            return true;
+                        })
                         // filter out matches that do not have uploaded files
                         .filter(m -> m.hasMatchFile(FileType.CDMInput) && m.hasMatchFile(FileType.CDMMatch))
                         .collect(Collectors.toList())))

diff --git a/...ch-tools/src/main/java/org/janelia/colormipsearch/cmd/dataexport/LMCDMatchesExporter.java b/...ch-tools/src/main/java/org/janelia/colormipsearch/cmd/dataexport/LMCDMatchesExporter.java
@@ -175,10 +175,24 @@ private void runExportForTargetIds(int jobId, List<String> targetMipIds) {
                         this::updateEMNeuron,
                         indexedNeuronURLs
                 ))
-                .filter(resultMatches -> resultMatches.getKey().isPublished()) // filter out unpublished LMs
+                .filter(resultMatches -> {
+                    if (resultMatches.getKey().isUnpublished()) {
+                        LOG.warn("Ignore matches for neuron {} - it was unpublished because: {}",
+                                resultMatches.getKey(), resultMatches.getKey().getUnpublishReasons());
+                        return false;
+                    }
+                    return true;
+                }) // filter out unpublished LMs
                 .peek(resultMatches -> resultMatches.setItems(resultMatches.getItems().stream()
                         // filter out unpublished EMs
-                        .filter(m -> m.getTargetImage().isPublished())
+                        .filter(m -> {
+                            if (m.getTargetImage().isUnpublished()) {
+                                LOG.warn("Removed match {} for {} - {} was unpublished because: {}", m, resultMatches.getKey(),
+                                        m.getTargetImage(), m.getTargetImage().getUnpublishReasons());
+                                return false;
+                            }
+                            return true;
+                        })
                         // filter out matches that do not have uploaded files
                         .filter(m -> m.hasMatchFile(FileType.CDMInput) && m.hasMatchFile(FileType.CDMMatch))
                         .collect(Collectors.toList())))