Remove min length constraint on term search (Issue #226) 🐛

nfdi4plants · Oct 10, 2022 · b09058d · b09058d
1 parent 13720b4
commit b09058d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/src/Client/Pages/TermSearch/TermSearchView.fs b/src/Client/Pages/TermSearch/TermSearchView.fs
@@ -28,11 +28,10 @@ let update (termSearchMsg: TermSearch.Msg) (currentState:TermSearch.Model) : Ter
 
     | SearchTermTextChange newTerm ->
 
-        let triggerNewSearch =
-            newTerm.Length > 2
+        let triggerNewSearch = newTerm.Trim() <> ""
 
         let (delay, bounceId, msgToBounce) =
-            (System.TimeSpan.FromSeconds 0.5),
+            (System.TimeSpan.FromSeconds 1.),
             "GetNewTermSuggestions",
             (
                 if triggerNewSearch then

diff --git a/src/Server/Database/Term.fs b/src/Server/Database/Term.fs
@@ -28,20 +28,14 @@ type Term(?credentials:Neo4JCredentials, ?session:IAsyncSession) =
             if searchType.IsSome then
                 searchType.Value.ofQueryString termName
             else
-                FullTextSearch.Complete.ofQueryString termName
+                FullTextSearch.PerformanceComplete.ofQueryString termName
         let query =
             let sourceOntologyText = """ WHERE EXISTS((:Term {accession: node.accession})-[:CONTAINED_IN]->(:Ontology {name: $OntologyName})) """
-            if searchType.IsSome && searchType.Value = FullTextSearch.Exact then
-                sprintf
-                    """MATCH (node:Term {name: $Name})%s
-                    RETURN node.accession, node.name, node.definition, node.is_obsolete"""
-                    (if sourceOntologyName.IsSome then sourceOntologyText else "")
-            else
-                sprintf
-                    """CALL db.index.fulltext.queryNodes("TermName",$Name)
-                    YIELD node%s
-                    RETURN node.accession, node.name, node.definition, node.is_obsolete"""
-                    (if sourceOntologyName.IsSome then sourceOntologyText else "")
+            sprintf
+                """CALL db.index.fulltext.queryNodes("TermName",$Name)
+                YIELD node%s
+                RETURN node.accession, node.name, node.definition, node.is_obsolete"""
+                (if sourceOntologyName.IsSome then sourceOntologyText else "")
         let param =
             Map [
                 "Name",fulltextSearchStr

diff --git a/src/Server/Server.fs b/src/Server/Server.fs
@@ -212,7 +212,9 @@ let ontologyApi (credentials : Helper.Neo4JCredentials) : IOntologyAPIv1 =
                         Term.Term(credentials).getByAccession foundAccession.Value
                     // This suggests we search for a term name
                     | notAnAccession ->
-                        Term.Term(credentials).getByName notAnAccession
+                        let searchTextLength = typedSoFar.Length
+                        let searchmode = if searchTextLength < 3 then Database.Helper.FullTextSearch.Exact else Database.Helper.FullTextSearch.PerformanceComplete
+                        Term.Term(credentials).getByName(notAnAccession, searchmode)
                     |> Array.ofSeq
                     |> sorensenDiceSortTerms typedSoFar
                 let arr = if dbSearchRes.Length <= max then dbSearchRes else Array.take max dbSearchRes