Index tokenized lowercase versions of name and types for UI searches

[simantics/platform.git] / bundles / org.simantics.document.ui / src / org / simantics / document / ui / function / SearchFunction.java

diff --git a/bundles/org.simantics.document.ui/src/org/simantics/document/ui/function/SearchFunction.java b/bundles/org.simantics.document.ui/src/org/simantics/document/ui/function/SearchFunction.java
index 0f33b28082dd8c5a42d3a49d08ed2e8929e1539c..32d84eb9acc1ce2e3b40b6d343b127bfae1e341f 100644 (file)
--- a/bundles/org.simantics.document.ui/src/org/simantics/document/ui/function/SearchFunction.java
+++ b/bundles/org.simantics.document.ui/src/org/simantics/document/ui/function/SearchFunction.java
@@ -1,80 +1,80 @@
-package org.simantics.document.ui.function;\r
-\r
-import java.util.Collection;\r
-import java.util.HashSet;\r
-import java.util.Map;\r
-import java.util.Set;\r
-\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.common.utils.Logger;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.genericrelation.Dependencies;\r
-import org.simantics.document.DocumentResource;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.operation.Layer0X;\r
-import org.simantics.scl.runtime.function.FunctionImpl5;\r
-import org.simantics.workbench.search.NameRow;\r
-import org.simantics.workbench.search.NamedResource;\r
-import org.simantics.workbench.search.SearchQuery;\r
-import org.simantics.workbench.search.SearchResult;\r
-import org.simantics.workbench.search.Searching;\r
-\r
-public class SearchFunction extends FunctionImpl5<IProgressMonitor, ReadGraph, Resource, SearchQuery, Integer, SearchResult> {\r
-\r
-       @Override\r
-       public SearchResult apply(IProgressMonitor monitor, ReadGraph graph, Resource model, SearchQuery query, Integer maxResults) {\r
-                try {\r
-                        Collection<Map<String, Object>> results = Searching.performSearch(graph, Layer0X.getInstance(graph).Dependencies, model,\r
-                           query.escaped(false).getQuery("Name","Types"), maxResults);\r
-                       return generateSearchResults(graph, results);\r
-               } catch (DatabaseException e) {\r
-                   Logger.defaultLogError(e);\r
-               }\r
-               return null;\r
-       }\r
-       \r
-    public static final SearchResult generateSearchResults(ReadGraph graph,\r
-            Collection<Map<String, Object>> results) throws DatabaseException {\r
-       Layer0 l0 = Layer0.getInstance(graph);\r
-        DocumentResource doc = DocumentResource.getInstance(graph);\r
-\r
-        SearchResult result = new SearchResult(NameRow.columns);\r
-        Set<Resource> processed = new HashSet<Resource>();\r
-\r
-        for (Map<String, Object> r : results) {\r
-            Resource resource = (Resource) r.get(Dependencies.FIELD_RESOURCE);\r
-\r
-            // Ignore non-documents\r
-            if (!graph.isInstanceOf(resource, doc.Document))\r
-                continue;\r
-\r
-           \r
-            // Prevent index corruption from producing duplicate results.\r
-            if (!processed.add(resource))\r
-                continue;\r
-\r
-          \r
-\r
-\r
-            Resource parent = (Resource) r.get(Dependencies.FIELD_PARENT);\r
-            String name = (String) r.get(Dependencies.FIELD_NAME);\r
-            // TODO : hackfix: Sometimes index reports resource as its own parent. \r
-            if (resource.equals(parent)) {\r
-               Resource p = graph.getPossibleObject(resource, l0.PartOf);\r
-               if (p != null)\r
-                       parent = p;\r
-            }\r
-\r
-            NameRow rst = new NameRow();\r
-            rst.resource = NamedResource.of(graph, resource, name);\r
-            rst.parent = NamedResource.of(graph, parent);\r
-\r
-            result.addRow(rst);\r
-        }\r
-        return result;\r
-    }\r
-       \r
-}\r
-\r
+package org.simantics.document.ui.function;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.common.utils.Logger;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.genericrelation.Dependencies;
+import org.simantics.document.DocumentResource;
+import org.simantics.layer0.Layer0;
+import org.simantics.operation.Layer0X;
+import org.simantics.scl.runtime.function.FunctionImpl5;
+import org.simantics.workbench.search.NameRow;
+import org.simantics.workbench.search.NamedResource;
+import org.simantics.workbench.search.SearchQuery;
+import org.simantics.workbench.search.SearchResult;
+import org.simantics.workbench.search.Searching;
+
+public class SearchFunction extends FunctionImpl5<IProgressMonitor, ReadGraph, Resource, SearchQuery, Integer, SearchResult> {
+
+       @Override
+       public SearchResult apply(IProgressMonitor monitor, ReadGraph graph, Resource model, SearchQuery query, Integer maxResults) {
+                try {
+                        Collection<Map<String, Object>> results = Searching.performSearch(graph, Layer0X.getInstance(graph).Dependencies, model,
+                           query.escapedWithForcedCase(false, false).getQuery(Dependencies.FIELD_NAME_SEARCH, Dependencies.FIELD_TYPES_SEARCH), maxResults);
+                       return generateSearchResults(graph, results);
+               } catch (DatabaseException e) {
+                   Logger.defaultLogError(e);
+               }
+               return null;
+       }
+       
+    public static final SearchResult generateSearchResults(ReadGraph graph,
+            Collection<Map<String, Object>> results) throws DatabaseException {
+       Layer0 l0 = Layer0.getInstance(graph);
+        DocumentResource doc = DocumentResource.getInstance(graph);
+
+        SearchResult result = new SearchResult(NameRow.columns);
+        Set<Resource> processed = new HashSet<Resource>();
+
+        for (Map<String, Object> r : results) {
+            Resource resource = (Resource) r.get(Dependencies.FIELD_RESOURCE);
+
+            // Ignore non-documents
+            if (!graph.isInstanceOf(resource, doc.Document))
+                continue;
+
+           
+            // Prevent index corruption from producing duplicate results.
+            if (!processed.add(resource))
+                continue;
+
+          
+
+
+            Resource parent = (Resource) r.get(Dependencies.FIELD_PARENT);
+            String name = (String) r.get(Dependencies.FIELD_NAME);
+            // TODO : hackfix: Sometimes index reports resource as its own parent. 
+            if (resource.equals(parent)) {
+               Resource p = graph.getPossibleObject(resource, l0.PartOf);
+               if (p != null)
+                       parent = p;
+            }
+
+            NameRow rst = new NameRow();
+            rst.resource = NamedResource.of(graph, resource, name);
+            rst.parent = NamedResource.of(graph, parent);
+
+            result.addRow(rst);
+        }
+        return result;
+    }
+       
+}
+