Commit cfa4ef29 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

fix merge conflict

parents a5789b7f 5da5c9fb
......@@ -210,7 +210,7 @@ public class BrowseController {
}
/**
* setup browsing of aggreagtions
* setup browsing of aggregations
*
* @param model
* @param i18n
......@@ -240,13 +240,15 @@ public class BrowseController {
} else {
log.info("listing agg: " + id);
List<ResultType> results;
if (format.contains("text/tg.work+xml")) {
List<String> editionFilter =
Arrays.asList(new String[] {"format:text/tg.edition+tg.aggregation+xml"});
results = this.tgsearchClientService
.search("isEditionOf:\"" + id + "\"", "relevance", 0, 20, editionFilter, true)
results = this.tgsearchClientService.getSearchClient()
.searchQuery()
.setQuery("*")
.addFilter("edition.isEditionOf:"+id)
.addFilter("format:text/tg.edition+tg.aggregation+xml")
.execute()
.getResult();
} else {
results = this.tgsearchClientService.listAggregation(id).getResult();
......
......@@ -103,4 +103,8 @@ public class TgsearchClientService {
return searchClient.infoQuery().listRevisions(id);
}
public SearchClient getSearchClient() {
return searchClient;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment