X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Fgenericrelation%2FDependenciesRelation.java;h=989639ef846b17b8a78c794e650b3fdd0503e399;hb=d4ae453f1f2e85de5650d75c03180fe776d1c914;hp=333f3771c843c636e2838b51b0d32488edf6e7fa;hpb=8b8630b93f8e4ec88a8a4eb53b55031407deedc0;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependenciesRelation.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependenciesRelation.java
index 333f3771c..989639ef8 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependenciesRelation.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependenciesRelation.java
@@ -43,6 +43,7 @@ import org.simantics.db.common.request.UnaryRead;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.event.ChangeListener;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.NoSingleResultException;
 import org.simantics.db.layer0.adapter.GenericRelation;
 import org.simantics.db.layer0.adapter.GenericRelationIndex;
 import org.simantics.db.layer0.genericrelation.DependencyChanges.Change;
@@ -77,7 +78,9 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
 		Pair.make(Dependencies.FIELD_RESOURCE, "Long"),
 		Pair.make(Dependencies.FIELD_NAME, "String"),
 		Pair.make(Dependencies.FIELD_TYPES, "Text"),
-		Pair.make(Dependencies.FIELD_GUID, "Text")
+		Pair.make(Dependencies.FIELD_GUID, "Text"),
+		Pair.make(Dependencies.FIELD_NAME_SEARCH, "Text"),
+		Pair.make(Dependencies.FIELD_TYPES_SEARCH, "Text")
 	};
 
 	final Resource resource;
@@ -151,7 +154,13 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
 
 				@Override
 				public void exception(AsyncReadGraph graph, Throwable throwable) {
-					LOGGER.error("Could not compile for resource {}", resource, throwable);
+				    if (throwable instanceof NoSingleResultException) {
+				        // Ignore
+				        if (LOGGER.isDebugEnabled())
+				            LOGGER.debug("Could not compile for resource {}", resource, throwable);
+				    } else {
+				        LOGGER.error("Could not compile for resource {}", resource, throwable);
+				    }
 				}
 
 			});
@@ -226,7 +235,7 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
 
 				ArrayList<Object[]> result = new ArrayList<Object[]>();
 				for (Entry entry : entries) {
-					result.add(new Object[] { ss.getRandomAccessId(entry.parent), ss.getRandomAccessId(entry.resource), entry.name, entry.types, entry.id });
+					result.add(new Object[] { ss.getRandomAccessId(entry.parent), ss.getRandomAccessId(entry.resource), entry.name, entry.types, entry.id, entry.name, entry.types });
 				}
 				return result;
 
@@ -242,21 +251,21 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
 
 	@Override
 	public List<Map<String, Object>> query(RequestProcessor session, String search, String bindingPattern, Object[] constants, int maxResultCount) {
-		if(!Dependencies.getBindingPattern().equals(bindingPattern)) throw new IllegalArgumentException("DependenciesRelation supports indexing only with 'bfffff'");
+		if(!Dependencies.getBindingPattern().equals(bindingPattern)) throw new IllegalArgumentException("DependenciesRelation supports indexing only with 'bfffffff'");
 		IndexedRelations indexer = session.getService(IndexedRelations.class);
 		return indexer.query(null, search, session, resource, (Resource)constants[0], maxResultCount);
 	}
 	
 	@Override
 	public List<Resource> queryResources(RequestProcessor session, String search, String bindingPattern, Object[] constants, int maxResultCount) {
-		if(!Dependencies.getBindingPattern().equals(bindingPattern)) throw new IllegalArgumentException("DependenciesRelation supports indexing only with 'bfffff'");
+		if(!Dependencies.getBindingPattern().equals(bindingPattern)) throw new IllegalArgumentException("DependenciesRelation supports indexing only with 'bfffffff'");
 		IndexedRelations indexer = session.getService(IndexedRelations.class);
 		return indexer.queryResources(null, search, session, resource, (Resource)constants[0], maxResultCount);
 	}
 
 	@Override
 	public List<Map<String, Object>> list(RequestProcessor session, String bindingPattern, Object[] constants, int maxResultCount) {
-		if(!Dependencies.getBindingPattern().equals(bindingPattern)) throw new IllegalArgumentException("DependenciesRelation supports indexing only with 'bfffff'");
+		if(!Dependencies.getBindingPattern().equals(bindingPattern)) throw new IllegalArgumentException("DependenciesRelation supports indexing only with 'bfffffff'");
 		IndexedRelations indexer = session.getService(IndexedRelations.class);
 		return indexer.query(null, null, session, resource, (Resource)constants[0], maxResultCount);
 	}
@@ -405,7 +414,7 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
 	                                	if(!entry.isValid(graph)) continue;
 	                                    Resource parent = graph.getPossibleObject(entry.component, L0.PartOf);
 	                                    if (parent != null) {
-	                                        _additions.add(new Object[] { ss.getRandomAccessId(parent), ss.getRandomAccessId(entry.component), name, types, id != null ? id.indexString() : "" });
+	                                        _additions.add(new Object[] { ss.getRandomAccessId(parent), ss.getRandomAccessId(entry.component), name, types, id != null ? id.indexString() : "", name, types});
 	                                    } else {
 		                                    //System.err.println("resource " + entry.component + ": no parent for entry " + name + " " + types);
 	                                    }
@@ -426,7 +435,7 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
 	                                        if(part != null) {
 	                                            _replacementKeys.add(ss.getRandomAccessId(entry.component));
 	                                            _replacementObjects.add(new Object[] { ss.getRandomAccessId(part), 
-	                                                    ss.getRandomAccessId(entry.component), name, types, id != null ? id.indexString() : "" });
+	                                                    ss.getRandomAccessId(entry.component), name, types, id != null ? id.indexString() : "", name, types});
 	                                        }
 	                                    }
 	                                }
@@ -610,7 +619,7 @@ public class DependenciesRelation extends UnsupportedRelation implements Generic
 
 		ArrayList<Object[]> result = new ArrayList<Object[]>(entries.size());
 		for (Entry entry : entries) {
-			result.add(new Object[] { ss.getRandomAccessId(entry.parent), ss.getRandomAccessId(entry.resource), entry.name, entry.types, entry.id });
+			result.add(new Object[] { ss.getRandomAccessId(entry.parent), ss.getRandomAccessId(entry.resource), entry.name, entry.types, entry.id, entry.name, entry.types });
 		}
 
 		Layer0X L0X = Layer0X.getInstance(graph);