From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 26 Mar 2014 12:45:03 +0000 (+0000)
Subject: Fixed Sysdyn search (refs #4786).
X-Git-Tag: 1.8.1~101
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=32ab453abbfba78203b2916697c6943ccd019939;p=simantics%2Fsysdyn.git

Fixed Sysdyn search (refs #4786).

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29202 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index 716cc5ed..37bbc783 100644
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ
diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 5da8119c..1ad68f5d 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -91,6 +91,7 @@ SYSDYN.HistoryRealization <T L0X.Realization
 SYSDYN.DefaultRealization <T L0X.Realization
 
 SYSDYN.ModulesSearchFunction : L0.Function
+  L0.HasLabel "Sysdyn Search" : L0.String
 
 SYSDYN.SearchContribution : WORKBENCH.SearchContribution
   WORKBENCH.hasSearchFunction SYSDYN.ModulesSearchFunction
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
index 3caae72c..edf5afea 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
@@ -58,10 +58,20 @@ public class ModulesSearchFunction extends FunctionImpl5<IProgressMonitor, ReadG
     @Override
     public SearchResult apply(IProgressMonitor monitor, ReadGraph graph, Resource model, SearchQuery query, Integer maxResults) {
         try {
+        	String origQuery = query.getOriginalQuery();
+        	if (!origQuery.isEmpty()) // Add asterisks for performSearch 
+        		query.setOriginalQuery("*" + origQuery + "*");
+        	
         	// Check whether only currently open diagram is searched
         	String filteredQuery = query.getQuery("Name","Types");
-        	Collection<Map<String, Object>> results = Searching.performSearch(graph, Layer0X.getInstance(graph).Dependencies, model, filteredQuery, MAX_RESULTS);
+        	Collection<Map<String, Object>> results = Searching.performSearch(graph, 
+        			Layer0X.getInstance(graph).Dependencies, 
+        			model, 
+        			filteredQuery, 
+        			MAX_RESULTS);
 
+        	query.setOriginalQuery(origQuery); // Restore the original query without *'s
+        	
         	if (!query.getSearchParams().contains(FindSearchTrim.CURRENT_DIAGRAM_OPTION))
             	return generateSearchResults(graph, results, Scope.ALL_MODELS);
         	else