X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLValueRequest.java;h=37d60a4439b90b1e79314a7ae5de48702629d4f2;hp=09f1523a2ede4ba26ff3c4d9a52df435647d302f;hb=ae2e31aa5eb35410e5b2ce222d42421154f3fecc;hpb=15f274a205dabc11df9bf880291320fa5274e535

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 09f1523a2..37d60a443 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
@@ -1,21 +1,20 @@
 package org.simantics.document.server.request;
 
+import java.util.Collections;
 import java.util.Map;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.Statement;
 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.common.utils.NameUtils;
 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;
 import org.simantics.scl.compiler.constants.StringConstant;
@@ -42,7 +41,7 @@ import org.simantics.utils.datastructures.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<CompilationContext, Object> {
+public class ServerSCLValueRequest extends ServerSCLValueRequestBase<org.simantics.document.server.request.ServerSCLValueRequest.CompilationContext> {
 
 	private final Pair<Resource,Resource> componentTypeAndRoot;
 	private final Resource literal;
@@ -70,7 +69,7 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 	}
 
 	public ServerSCLValueRequest(ReadGraph graph, Resource s, Resource o, Resource p) throws DatabaseException {
-	    this(getComponentTypeAndRoot(graph, s), o, resolveExpectedValueType(graph, p));
+	    this(getComponentTypeAndRoot(graph, s, o), o, resolveExpectedValueType(graph, p));
 	}
 
 	private static Pair<Resource,Resource> getComponentTypeAndRoot(ReadGraph graph, Variable property)  throws DatabaseException {
@@ -88,33 +87,9 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		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));
-				//      System.err.println("getComponentTypeAndRoot3 " + graph.getPossibleURI(component) + " => " + graph.getPossibleURI(type) + " " + graph.getPossibleURI(root));
-				return Pair.make(type, root);
-			} else {
-				Resource doc = graph.syncRequest(new PossibleTypedParent(component, DocumentationResource.getInstance(graph).Document));
-				if(doc != null) {
-					Resource componentType = graph.getSingleType(doc);
-					Resource root = graph.syncRequest(new IndexRoot(doc));
-					return Pair.make(componentType, root);
-				} else {
-					System.err.println("component = " + component);
-					Resource root = graph.syncRequest(new IndexRoot(component));
-//					Resource componentType = graph.getSingleType(doc);
-					return Pair.make(null, root);
-				}
-			}
-		}
-		throw new IllegalStateException();
-	}
-
 	public static Object compileAndEvaluate(ReadGraph graph, Variable context) throws DatabaseException {
 		SCLContext sclContext = SCLContext.getCurrent();
-        Object oldGraph = sclContext.get("graph");
+		Object oldGraph = sclContext.get("graph");
 		try {
 			Function1<Object,Object> exp = compile(graph, context);
 			sclContext.put("graph", graph);
@@ -124,7 +99,7 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		} catch (Throwable t) {
 			throw new DatabaseException(t);
 		} finally {
-            sclContext.put("graph", oldGraph);
+			sclContext.put("graph", oldGraph);
 		}
 	}
 
@@ -160,9 +135,16 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 			public CompilationContext perform(ReadGraph graph)
 					throws DatabaseException {
 				RuntimeEnvironment runtimeEnvironment = graph.syncRequest(getRuntimeEnvironmentRequest(parameter.first, parameter.second));
-				Map<String, ComponentTypeProperty> propertyMap =
+				Map<String, ComponentTypeProperty> propertyMap;
+				if (parameter.first != null) {
+				    propertyMap =
 						graph.syncRequest(new ReadComponentTypeInterfaceRequest(parameter.first, runtimeEnvironment.getEnvironment()),
 								TransientCacheListener.<Map<String, ComponentTypeProperty>>instance());
+				} else {
+				    // TODO: Antti to consider
+				    // To handle procedural user components
+				    propertyMap = Collections.emptyMap();
+				}
 				return new CompilationContext(runtimeEnvironment, propertyMap);
 			}
 		});
@@ -260,6 +242,20 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
     public static Function1<Object, Object> validate(ReadGraph graph, Variable context) throws DatabaseException {
         return graph.syncRequest(new ServerSCLValueValidationRequest(graph, context), TransientCacheListener.instance());
     }
+
+    @Override
+    protected String getContextDescription(ReadGraph graph) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        Statement possibleOwner = graph.getPossibleStatement(literal, L0.IsOwnedBy);
+        if(possibleOwner != null) {
+            String uri = graph.getPossibleURI(possibleOwner.getObject());
+            if(uri != null) {
+                String propertyName = NameUtils.getSafeName(graph, graph.getInverse(possibleOwner.getPredicate()));
+                return uri + "#" + propertyName;
+            }
+        }
+        return super.getContextDescription(graph);
+    }
     
     public static class ServerSCLValueValidationRequest extends ServerSCLValueRequest {