X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLValueRequest.java;fp=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLValueRequest.java;h=77cd9b4f4a3a8cfe175b27c40508819dc3cfa880;hb=3850fec72035293b9a4ede780d01aedc5fbc9056;hp=f9181d271073964b6082fef5119a679e8c371075;hpb=1e957fc9da518f3bef8a2c19cad72772087e1b6a;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
index f9181d271..77cd9b4f4 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
@@ -7,12 +7,14 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.procedure.adapter.TransientCacheListener;
 import org.simantics.db.common.request.IndexRoot;
+import org.simantics.db.common.request.PossibleTypedParent;
 import org.simantics.db.common.request.UnaryRead;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationContext;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationRequest;
 import org.simantics.db.layer0.util.RuntimeEnvironmentRequest2;
 import org.simantics.db.layer0.variable.Variable;
+import org.simantics.document.base.ontology.DocumentationResource;
 import org.simantics.document.server.request.ServerSCLValueRequest.CompilationContext;
 import org.simantics.layer0.Layer0;
 import org.simantics.scl.compiler.common.names.Name;
@@ -64,7 +66,11 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 	}
 
 	public ServerSCLValueRequest(ReadGraph graph, Variable context) throws DatabaseException {
-		this(getComponentTypeAndRoot(graph, context), context.getRepresents(graph), resolveExpectedValueType(graph, context));
+		this(getComponentTypeAndRoot(graph, context), context.getRepresents(graph), resolveExpectedValueType(graph, context.getPredicateResource(graph)));
+	}
+
+	public ServerSCLValueRequest(ReadGraph graph, Resource s, Resource o, Resource p) throws DatabaseException {
+		this(getComponentTypeAndRoot(graph, s), o, resolveExpectedValueType(graph, p));
 	}
 
 	private static Pair<Resource,Resource> getComponentTypeAndRoot(ReadGraph graph, Variable property)  throws DatabaseException {
@@ -77,11 +83,29 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 				return Pair.make(type, root);
 			}
 		}
-		parent = parent.getParent(graph);
+		while(represents == null) {
+			parent = parent.getParent(graph);
+			represents = parent.getPossibleRepresents(graph);
+		}
 		Resource root = graph.syncRequest(new IndexRoot(property.getRepresents(graph)));
 		return Pair.make(parent.getType(graph), root);
 	}
 
+	private static Pair<Resource,Resource> getComponentTypeAndRoot(ReadGraph graph, Resource component)  throws DatabaseException {
+		if(component != null) {
+			Resource type = graph.syncRequest(new FindPossibleComponentTypeRequest(component));
+			if(type != null) {
+				Resource root = graph.syncRequest(new IndexRoot(type));
+				return Pair.make(type, root);
+			} else {
+				Resource doc = graph.syncRequest(new PossibleTypedParent(component, DocumentationResource.getInstance(graph).Document));
+				Resource root = graph.syncRequest(new IndexRoot(component));
+				return Pair.make(graph.getSingleType(doc), root);
+			}
+		}
+		throw new IllegalStateException();
+	}
+
 	public static Object compileAndEvaluate(ReadGraph graph, Variable context) throws DatabaseException {
 		SCLContext sclContext = SCLContext.getCurrent();
         Object oldGraph = sclContext.get("graph");
@@ -102,6 +126,10 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 	    return graph.syncRequest(new ServerSCLValueRequest(graph, context), TransientCacheListener.<Function1<Variable,Object>>instance());
 	}
 
+	public static Function1<Variable, Object> compile(ReadGraph graph, Resource s, Resource o, Resource p) throws DatabaseException {
+	    return graph.syncRequest(new ServerSCLValueRequest(graph, s, o, p), TransientCacheListener.<Function1<Variable,Object>>instance());
+	}
+
 	@Override
 	protected String getExpressionText(ReadGraph graph)
 			throws DatabaseException {