Merge pull request #152 from natverse/feature/search-numeric

Feature/search numeric

DESCRIPTION

@@ -43,12 +43,13 @@ Imports:
     tibble,
     Matrix,
     checkmate,
-    magrittr
+    magrittr,
+    glue
 Remotes: 
     natverse/drvid,
     natverse/nat
 Encoding: UTF-8
 Language: en-GB
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 URL: https://natverse.org/neuprintr, https://github.com/natverse/neuprintr
 BugReports: https://github.com/natverse/neuprintr/issues

NAMESPACE

@@ -39,6 +39,7 @@ export(progress_natprogress)
 importFrom(Matrix,sparseMatrix)
 importFrom(checkmate,assert_integer)
 importFrom(drvid,read.neuron.dvid)
+importFrom(glue,glue)
 importFrom(httr,parse_url)
 importFrom(magrittr,"%>%")
 importFrom(memoise,memoise)

R/name.R

@@ -80,6 +80,9 @@ neuprint_get_neuron_names <- function(bodyids, dataset = NULL, all_segments = TR
 #' # or simpler
 #' neuprint_get_meta('DA2')
 #' }
+#' \dontrun{
+#' neuprint_get_meta('cropped:false')
+#' }
 neuprint_get_meta <- function(bodyids, dataset = NULL, all_segments = TRUE,
                               conn = NULL, chunk=TRUE, progress=FALSE,
                               possibleFields=NULL, ...){
@@ -313,12 +316,16 @@ neuprint_search <- function(search, field = "name", fixed=FALSE, exact=NULL,
     exact=FALSE
   if(isFALSE(fixed) && isFALSE(exact))
     warning("Ignoring exact=FALSE as regular expression searches are always exact!")
-  all_segments.cypher = ifelse(all_segments,"Segment","Neuron")
-  cypher = sprintf("MATCH (n:`%s`) WHERE n.%s %s \\\"%s\\\" RETURN n.bodyId",
-                   all_segments.cypher,
-                   field,
-                   ifelse(fixed, ifelse(exact, "=", "CONTAINS"), "=~"),
-                   search)
+  nodetype = ifelse(all_segments,'Segment','Neuron')
+  fieldtype=neuprint_typeof(field, type = 'neo4j')
+  if(fieldtype=="STRING") {
+    search=glue('\\"{search}\\"')
+    operator=ifelse(fixed, ifelse(exact, "=", "CONTAINS"), "=~")
+  } else operator="="
+  cypher = glue("
+                MATCH (n:`{nodetype}`) \\
+                WHERE n.{field} {operator} {search} \\
+                RETURN n.bodyId")
   nc = neuprint_fetch_custom(cypher=cypher, conn=conn, dataset = dataset, ...)
   foundbodyids=unlist(nc$data)
   if(meta && isTRUE(length(foundbodyids)>0)){
@@ -439,3 +446,29 @@ dfFields <- function(field_name) {
   }
   newnames
 }
+
+#' @importFrom glue glue
+neuprint_typeof <- function(field, type=c("r", "neo4j"), cache=TRUE,
+                            conn=NULL, dataset=NULL,  ...) {
+  type=match.arg(type)
+  if(length(field)>1) {
+    ff=sapply(field, neuprint_typeof, type=type, cache=cache, conn=conn, dataset=dataset, ...)
+    return(ff)
+  }
+  q <- if(type=='r') {"
+    MATCH (n:Neuron)
+    WHERE exists(n.`{field}`)
+    RETURN n.{field} AS {field}
+    LIMIT 1
+  " } else {"
+    MATCH (n:Neuron)
+    WHERE exists(n.`{field}`)
+    RETURN apoc.meta.type(n.`{field}`)
+    LIMIT 1
+  "}
+  q=glue(gsub("\\s+", " ", q))
+  r=try(neuprintr::neuprint_fetch_custom(q, include_headers = FALSE, cache = cache, conn=NULL, dataset=NULL, ...))
+  if(inherits(r, 'try-error')) NA_character_
+  else if(type=="r") mode(unlist(r$data, use.names = F))
+  else unlist(r$data, use.names = F)
+}

tests/testthat/test-name.R

@@ -62,6 +62,17 @@ test_that("test name searches ", {
                structure(c(NA_character_, ndup), .Names=c(1,iddup)))
 })
 
+test_that("test searches on non-string fields", {
+  expect_equal(neuprint_typeof('bodyId', 'r'), 'numeric')
+  expect_equal(neuprint_typeof('cropped', 'r'), 'logical')
+  expect_equal(neuprint_typeof('bodyId', 'neo4j'), 'INTEGER')
+  expect_equal(neuprint_typeof('cropped', 'neo4j'), 'BOOLEAN')
+  expect_equal(neuprint_typeof('type', 'neo4j'), 'STRING')
+
+  expect_equal(neuprint_ids("bodyId:202916528"), "202916528")
+  expect_is(neuprint_ids("cropped:false"), 'character')
+})
+
 test_that("test bad dataset specification ", {
   expect_error(neuprint_search(".*DA2.*", dataset = 'hemibrain1'))
 })