X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.workbench.search%2Fsrc%2Forg%2Fsimantics%2Fworkbench%2Fsearch%2FSearchQuery.java;h=d90a90ee9c8118921ea3e1a6d036140875d70063;hp=6cacacbf7567941b2ca955236359ea444194073e;hb=refs%2Fchanges%2F38%2F238%2F2;hpb=24e2b34260f219f0d1644ca7a138894980e25b14

diff --git a/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/SearchQuery.java b/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/SearchQuery.java
index 6cacacbf7..d90a90ee9 100644
--- a/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/SearchQuery.java
+++ b/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/SearchQuery.java
@@ -1,148 +1,148 @@
-package org.simantics.workbench.search;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.simantics.db.layer0.genericrelation.IndexQueries;
-
-public class SearchQuery {
-	
-	private String originalQuery;
-	private Map<String,String> searchFlags = new HashMap<String, String>();
-	private Set<String> searchParams = new HashSet<String>();
-	
-	public SearchQuery() {
-	}
-	
-	public SearchQuery(String originalQuery) {
-		this.originalQuery = originalQuery;
-	}
-
-	public void setOriginalQuery(String originalQuery) {
-		this.originalQuery = originalQuery;
-	}
-	
-	public String getOriginalQuery() {
-		return originalQuery;
-	}
-	
-	public String getQuery(Set<String> supportedParams) {
-		if (originalQuery.trim().isEmpty())
-			return "";
-		String query = "";
-		int count = 0;
-		for (String key : searchFlags.keySet()) {
-			if (!supportedParams.contains(key))
-				continue;
-			if (!"on".equals(searchFlags.get(key)))
-				continue;
-			if (count > 0)
-				query += " OR ";
-//			String prefix = originalQuery.startsWith("*") ? "" : "*";
-//			String suffix = originalQuery.endsWith("*") ? "" : "*";
-//			query += key+":"+prefix+originalQuery+suffix;
-			query += key+":"+originalQuery;
-			count++;
-		}
-		return query;
-	}
-	
-	public String getQuery(String... supportedParams) {
-		Set<String> set = new HashSet<String>();
-		for (String s : supportedParams)
-			set.add(s);
-		return getQuery(set);
-	}
-	
-	
-	
-	public void setSearchFlag(String key, String value) {
-		searchFlags.put(key, value);
-	}
-	
-	public void setSearchParam(String key) {
-		searchParams.add(key);
-	}
-	
-	public Map<String, String> getSearchFlags() {
-		return Collections.unmodifiableMap(searchFlags);
-	}
-	
-	public Set<String> getSearchParams() {
-		return Collections.unmodifiableSet(searchParams);
-	}
-	
-	public boolean getBooleanFlag(String key) {
-		if ("on".equals(searchFlags.get(key)))
-			return true;
-		return false;
-	}
-	
-	public boolean getBooleanParam(String key) {
-		if (searchParams.contains(key))
-			return true;
-		return false;
-	}
-	
-	@Override
-	public String toString() {
-		return originalQuery;
-	}
-
-	public SearchQuery withOriginalQuery(String query) {
-		SearchQuery ret = new SearchQuery(query);
-		ret.searchFlags = new HashMap<String, String>(searchFlags);
-		ret.searchParams = new HashSet<String>(searchParams);
-		return ret;
-	}
-
-	public SearchQuery escaped(boolean escapeWildcards) {
-		return withOriginalQuery( IndexQueries.escape( originalQuery, escapeWildcards ) );
-	}
-
-	public static URL encode(File file, SearchQuery query) throws IOException {
-		URL url = file.toURI().toURL();
-		String s = url.toString() + "?search=" + URLEncoder.encode(query.getOriginalQuery(), "UTF-8");
-		Map<String, String> flags = query.getSearchFlags();
-		for (String key : flags.keySet()) {
-			s += "&"+key+"="+flags.get(key);
-		}
-		
-		for (String param : query.getSearchParams()) {
-			s += "&"+param;
-		}
-			
-		url = new URL(s);
-		return url;
-	}
-	    
-    public static SearchQuery decode(URL url) throws IOException{
-    	 String query = url.getQuery();
-    	 SearchQuery searchQuery = new SearchQuery();
-         if (query != null) {
-             for (String arg : query.split("&")) {
-                 String[] keyvalue = arg.split("=");
-                 if ("search".equals(keyvalue[0])) {
-                    if (keyvalue.length == 2)
-                         searchQuery.setOriginalQuery(URLDecoder.decode(keyvalue[1], "UTF-8"));
-                 } else if (keyvalue.length == 2){
-                	 searchQuery.setSearchFlag(URLDecoder.decode(keyvalue[0], "UTF-8"), URLDecoder.decode(keyvalue[1], "UTF-8"));
-                 } else if (keyvalue.length == 1) {
-                	 searchQuery.setSearchParam(URLDecoder.decode(keyvalue[0], "UTF-8"));
-                 }
-             }
-         }
-         return searchQuery;
-    }
-    
-   
-
-}
+package org.simantics.workbench.search;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.simantics.db.layer0.genericrelation.IndexQueries;
+
+public class SearchQuery {
+	
+	private String originalQuery;
+	private Map<String,String> searchFlags = new HashMap<String, String>();
+	private Set<String> searchParams = new HashSet<String>();
+	
+	public SearchQuery() {
+	}
+	
+	public SearchQuery(String originalQuery) {
+		this.originalQuery = originalQuery;
+	}
+
+	public void setOriginalQuery(String originalQuery) {
+		this.originalQuery = originalQuery;
+	}
+	
+	public String getOriginalQuery() {
+		return originalQuery;
+	}
+	
+	public String getQuery(Set<String> supportedParams) {
+		if (originalQuery.trim().isEmpty())
+			return "";
+		String query = "";
+		int count = 0;
+		for (String key : searchFlags.keySet()) {
+			if (!supportedParams.contains(key))
+				continue;
+			if (!"on".equals(searchFlags.get(key)))
+				continue;
+			if (count > 0)
+				query += " OR ";
+//			String prefix = originalQuery.startsWith("*") ? "" : "*";
+//			String suffix = originalQuery.endsWith("*") ? "" : "*";
+//			query += key+":"+prefix+originalQuery+suffix;
+			query += key+":"+originalQuery;
+			count++;
+		}
+		return query;
+	}
+	
+	public String getQuery(String... supportedParams) {
+		Set<String> set = new HashSet<String>();
+		for (String s : supportedParams)
+			set.add(s);
+		return getQuery(set);
+	}
+	
+	
+	
+	public void setSearchFlag(String key, String value) {
+		searchFlags.put(key, value);
+	}
+	
+	public void setSearchParam(String key) {
+		searchParams.add(key);
+	}
+	
+	public Map<String, String> getSearchFlags() {
+		return Collections.unmodifiableMap(searchFlags);
+	}
+	
+	public Set<String> getSearchParams() {
+		return Collections.unmodifiableSet(searchParams);
+	}
+	
+	public boolean getBooleanFlag(String key) {
+		if ("on".equals(searchFlags.get(key)))
+			return true;
+		return false;
+	}
+	
+	public boolean getBooleanParam(String key) {
+		if (searchParams.contains(key))
+			return true;
+		return false;
+	}
+	
+	@Override
+	public String toString() {
+		return originalQuery;
+	}
+
+	public SearchQuery withOriginalQuery(String query) {
+		SearchQuery ret = new SearchQuery(query);
+		ret.searchFlags = new HashMap<String, String>(searchFlags);
+		ret.searchParams = new HashSet<String>(searchParams);
+		return ret;
+	}
+
+	public SearchQuery escaped(boolean escapeWildcards) {
+		return withOriginalQuery( IndexQueries.escape( originalQuery, escapeWildcards ) );
+	}
+
+	public static URL encode(File file, SearchQuery query) throws IOException {
+		URL url = file.toURI().toURL();
+		String s = url.toString() + "?search=" + URLEncoder.encode(query.getOriginalQuery(), "UTF-8");
+		Map<String, String> flags = query.getSearchFlags();
+		for (String key : flags.keySet()) {
+			s += "&"+key+"="+flags.get(key);
+		}
+		
+		for (String param : query.getSearchParams()) {
+			s += "&"+param;
+		}
+			
+		url = new URL(s);
+		return url;
+	}
+	    
+    public static SearchQuery decode(URL url) throws IOException{
+    	 String query = url.getQuery();
+    	 SearchQuery searchQuery = new SearchQuery();
+         if (query != null) {
+             for (String arg : query.split("&")) {
+                 String[] keyvalue = arg.split("=");
+                 if ("search".equals(keyvalue[0])) {
+                    if (keyvalue.length == 2)
+                         searchQuery.setOriginalQuery(URLDecoder.decode(keyvalue[1], "UTF-8"));
+                 } else if (keyvalue.length == 2){
+                	 searchQuery.setSearchFlag(URLDecoder.decode(keyvalue[0], "UTF-8"), URLDecoder.decode(keyvalue[1], "UTF-8"));
+                 } else if (keyvalue.length == 1) {
+                	 searchQuery.setSearchParam(URLDecoder.decode(keyvalue[0], "UTF-8"));
+                 }
+             }
+         }
+         return searchQuery;
+    }
+    
+   
+
+}