L0.Entity queries no longer returned any results after the changes done
in #7415.
refs #7753
Change-Id: I7f24b200b410606f93b5f8be7dd0c50de4fd7097
private String constructLuceneQuery(ReadGraph graph, Resource type, String filter) throws DatabaseException {
Layer0 L0 = Layer0.getInstance(graph);
StringBuilder sb = new StringBuilder();
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;
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.escape( typeName, true ) );
- if (filter.length() > 0) {
if (sb.length() > 0)
sb.append(" AND ");
sb.append(filter);
if (sb.length() > 0)
sb.append(" AND ");
sb.append(filter);