Fix bug in neuprint_get_synapses(progress=T)

* NULL roi was not being handled correctly * tryCatch was masking a programming logic error again (see #84) * progress on #90
natverse · Feb 29, 2020 · 78f65eb · jefferis · Feb 29, 2020 · jefferis
1 parent f708aa8
commit 78f65eb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/R/synapses.R b/R/synapses.R
@@ -28,9 +28,7 @@
 neuprint_get_synapses <- function(bodyids, roi = NULL, progress = FALSE, dataset = NULL, conn = NULL, ...){
   conn = neuprint_login(conn)
   bodyids = neuprint_ids(bodyids, conn = conn, dataset = dataset)
-  if (is.null(roi)) {
-    roi = ""
-  } else{
+  if (!is.null(roi)) {
     possible.rois = neuprint_ROIs(dataset = dataset, conn = conn, ...)
     if (sum(!roi %in% possible.rois) > 0) {
       stop(
@@ -51,9 +49,11 @@ neuprint_get_synapses <- function(bodyids, roi = NULL, progress = FALSE, dataset
       progress = FALSE,
       dataset = dataset,
       conn = conn, ...),
-      error = function(e) NULL)))
+      error = function(e) {warning(e); NULL})))
     return(d)
   }
+  if(is.null(roi)) roi <- ""
+
   cypher.post = sprintf(paste("WITH %s AS bodyIds UNWIND bodyIds AS bodyId",
                               "MATCH (a:`%s`)-[:Contains]->(c:SynapseSet)-[:Contains]->(s:Synapse)<-[:SynapsesTo]-(:Synapse)<-[:Contains]-(:SynapseSet)<-[:Contains]-(b:`%s`)",
                               "WHERE a.bodyId=bodyId AND (s.type='post') %s",