private String constructLuceneQuery(ReadGraph graph, Resource type, String filter) throws DatabaseException {
Layer0 L0 = Layer0.getInstance(graph);
StringBuilder sb = new StringBuilder();
- if (!L0.Entity.equals(type)) {
+ boolean emptyFilter = filter.isEmpty();
+ if (emptyFilter || !type.equals(L0.Entity)) {
String typeName = graph.getPossibleRelatedValue(type, L0.HasName, Bindings.STRING);
if (typeName == null || typeName.isEmpty())
return null;
- sb.append("Types:*").append( IndexQueries.escape( typeName, true ) );
+ sb.append("Types:").append( IndexQueries.quoteTerm(typeName) );
}
- if (filter.length() > 0) {
+ if (!emptyFilter) {
if (sb.length() > 0)
sb.append(" AND ");
sb.append(filter);
}
+ if (sb.length() == 0) {
+ sb.append("*:*");
+ }
return sb.toString();
}
@Override
public int getType() {
- return RequestFlags.IMMEDIATE_UPDATE;
+ // This query should not be immediate update since it takes a long time!
+ return RequestFlags.INVALIDATE;
}
}
@Override
public Collection<Resource> findByName(ReadGraph graph, Resource model,
String name) throws DatabaseException {
- Layer0 L0 = Layer0.getInstance(graph);
- CollectionSupport coll = graph.getService(CollectionSupport.class);
- List<Resource> results = coll.createList();
- for(Resource match : find(graph, model, name)) {
- if(name.equals(graph.getPossibleRelatedValue(match, L0.HasName, Bindings.STRING))) results.add(match);
- }
- return results;
+ return find(graph, model, IndexQueries.quoteTerm(name));
}
}