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 { ...@@ -210,7 +210,7 @@ public class BrowseController {
} }
/** /**
* setup browsing of aggreagtions * setup browsing of aggregations
* *
* @param model * @param model
* @param i18n * @param i18n
...@@ -240,13 +240,15 @@ public class BrowseController { ...@@ -240,13 +240,15 @@ public class BrowseController {
} else { } else {
log.info("listing agg: " + id); log.info("listing agg: " + id);
List<ResultType> results; List<ResultType> results;
if (format.contains("text/tg.work+xml")) { if (format.contains("text/tg.work+xml")) {
List<String> editionFilter = results = this.tgsearchClientService.getSearchClient()
Arrays.asList(new String[] {"format:text/tg.edition+tg.aggregation+xml"}); .searchQuery()
results = this.tgsearchClientService .setQuery("*")
.search("isEditionOf:\"" + id + "\"", "relevance", 0, 20, editionFilter, true) .addFilter("edition.isEditionOf:"+id)
.addFilter("format:text/tg.edition+tg.aggregation+xml")
.execute()
.getResult(); .getResult();
} else { } else {
results = this.tgsearchClientService.listAggregation(id).getResult(); results = this.tgsearchClientService.listAggregation(id).getResult();
......
...@@ -103,4 +103,8 @@ public class TgsearchClientService { ...@@ -103,4 +103,8 @@ public class TgsearchClientService {
return searchClient.infoQuery().listRevisions(id); 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