Improvements to Lucene indexing

[simantics/platform.git] / bundles / org.simantics.db.common / src / org / simantics / db / common / request / TypeString.java

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
index a2faedb5abcd9aba3a784ce76d3901b85d281b8b..1813b0744f0318b5418a64c7e0d439a468429103 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
@@ -1,58 +1,64 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
- * in Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.db.common.request;\r
-\r
-import java.util.Set;\r
-\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.ResourceSet;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
-\r
-public class TypeString extends BinaryRead<ResourceSet, String, String> {\r
-\r
-    final private Layer0 L0;\r
-    \r
-    public TypeString(Layer0 L0, Set<Resource> set) {\r
-        super((ResourceSet)set, " ");\r
-        this.L0 = L0;\r
-    }\r
-\r
-//    public TypeString(Layer0 L0, ResourceSet set, String separator) {\r
-//        super(set, separator);\r
-//        if (separator == null)\r
-//            throw new NullPointerException("null separator");\r
-//        this.L0 = L0;\r
-//    }\r
-\r
-    @Override\r
-    public String perform(ReadGraph graph) throws DatabaseException {\r
-\r
-       if (parameter == null || parameter.isEmpty()) return "";\r
-\r
-       StringBuilder result = new StringBuilder();\r
-\r
-        boolean first = true;\r
-       for(Resource r : parameter) {\r
-           String name = graph.getPossibleRelatedValue(r, L0.HasName, Bindings.STRING);\r
-            if(!first) result.append(parameter2);\r
-            else first = false;\r
-            result.append(name);\r
-       }\r
-       \r
-       return result.toString();\r
-       \r
-    }\r
-\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.common.request;
+
+import java.util.Set;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.ResourceSet;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+
+public class TypeString extends BinaryRead<ResourceSet, String, String> {
+
+    final private Layer0 L0;
+    
+    public TypeString(Layer0 L0, Set<Resource> set) {
+        super((ResourceSet)set, " ");
+        this.L0 = L0;
+    }
+
+//    public TypeString(Layer0 L0, ResourceSet set, String separator) {
+//        super(set, separator);
+//        if (separator == null)
+//            throw new NullPointerException("null separator");
+//        this.L0 = L0;
+//    }
+
+    @Override
+    public String perform(ReadGraph graph) throws DatabaseException {
+
+       if (parameter == null || parameter.isEmpty()) return "";
+
+       StringBuilder result = new StringBuilder();
+
+        boolean first = true;
+       for(Resource r : parameter) {
+           String name = graph.getPossibleRelatedValue(r, L0.HasName, Bindings.STRING);
+           if (name != null) {
+                if(!first) result.append(parameter2);
+                else first = false;
+                result.append(escapeToken(name));
+           }
+       }
+       
+       return result.toString();
+       
+    }
+    
+    public static String escapeToken(String token) {
+       return token.replaceAll("( |\\\\)", "\\\\$0");
+       }
+
 }
\ No newline at end of file