X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Fgenericrelation%2FIndexQueries.java;h=2be6bf5d0e1f270655ed0828acbc07975e075b52;hb=e3446802a81064942a7cbfea0c577e21ae5ae658;hp=135c5ebc2a107b02d20923db0cdd0eda52f082a8;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/IndexQueries.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/IndexQueries.java
index 135c5ebc2..2be6bf5d0 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/IndexQueries.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/IndexQueries.java
@@ -52,7 +52,7 @@ public class IndexQueries {
 			// These characters are part of the query syntax and must be escaped
 			if (c == '\\' || c == '+' || c == '-' || c == '!' || c == '(' || c == ')' || c == ':'
 					|| c == '^' || c == '[' || c == ']' || c == '\"' || c == '{' || c == '}' || c == '~'
-					|| c == '|' || c == '&' || c == '/' || (escapeWildcards && (c == '*' || c == '?'))) {
+					|| c == '|' || c == '&' || c == '/' || c == ' ' || (escapeWildcards && (c == '*' || c == '?'))) {
 				sb.append('\\');
 				sb.append(c);
 				lastWhitespace = false;
@@ -95,7 +95,7 @@ public class IndexQueries {
 			// These characters are part of the query syntax and must be escaped
 			if (c == '\\' || c == '+' || c == '-' || c == '!' || c == '(' || c == ')' || c == ':'
 					|| c == '^' || c == '[' || c == ']' || c == '\"' || c == '{' || c == '}' || c == '~'
-					|| c == '|' || c == '&' || c == '/' || (escapeWildcards && (c == '*' || c == '?'))) {
+					|| c == '|' || c == '&' || c == '/' || c == ' ' || (escapeWildcards && (c == '*' || c == '?'))) {
 				return true;
 			} else if (Character.isWhitespace(c)) {
 				lastWhitespace = true;
@@ -113,8 +113,9 @@ public class IndexQueries {
 	}
 
 	private static final String[] RESERVED_WORDS = {
-		"AND", "and",
-		"OR", "or"
+		"AND", "\\AND",
+		"OR", "\\OR",
+		"NOT", "\\NOT",
 	};
 
 	/**
@@ -158,8 +159,55 @@ public class IndexQueries {
 	}
 
 	public static String escapeTerm(String field, String term, boolean escapeWildcards) {
-		StringBuilder sb = new StringBuilder();
-		return escapeTerm(field, term, escapeWildcards, sb).toString();
+		return escapeTerm(field, term, escapeWildcards, new StringBuilder()).toString();
+	}
+
+	public static StringBuilder quoteTerm(String field, String term, StringBuilder result) {
+		if (field != null)
+			result.append(field).append(':');
+		result.append("\"");
+		result.append(term.replaceAll("(\"|\\\\)", "\\\\$0"));
+		result.append("\"");
+		return result;
+	}
+
+	public static String quoteTerm(String term) {
+		return quoteTerm(null, term, new StringBuilder(term.length()*2)).toString();
+	}
+
+	public static String quoteTerm(String field, String term) {
+		return quoteTerm(field, term,
+				new StringBuilder(
+						term.length()*2
+						+ (field != null ? field.length() + 1 : 0))
+				).toString();
+	}
+
+	private static String join(String withString, String... exps) {
+		if (exps.length == 0)
+			return "";
+		StringBuilder sb = new StringBuilder(128);
+		for (int i = 0; i < exps.length - 1; ++i) {
+			sb.append(exps[i]).append(withString);
+		}
+		sb.append(exps[exps.length - 1]);
+		return sb.toString();
+	}
+
+	public static String and(String exp1, String exp2) {
+		return exp1 + " AND " + exp2;
+	}
+
+	public static String and(String... exps) {
+		return join(" AND ", exps);
+	}
+
+	public static String or(String exp1, String exp2) {
+		return exp1 + " OR " + exp2;
+	}
+
+	public static String or(String... exps) {
+		return join(" OR ", exps);
 	}
 
 //	public static void main(String[] args) {