Skip to content
Snippets Groups Projects
Commit 82d8598b authored by Stefan E. Funk's avatar Stefan E. Funk
Browse files

Merge branch '63-listsets-is-not-delivering-all-sets' into 'develop'

fix: use administrativeMetadata for ListSets request

Closes #63

See merge request dariah-de/dariah-de-oai-pmh-services!22
parents 11ad08d1 551f771b
No related branches found
No related tags found
No related merge requests found
Pipeline #307874 passed
...@@ -94,13 +94,13 @@ public class SetListDeliverer { ...@@ -94,13 +94,13 @@ public class SetListDeliverer {
"doc['administrativeMetadata.dcterms:identifier'].value + '" + DH_FIELD_DIVIDER "doc['administrativeMetadata.dcterms:identifier'].value + '" + DH_FIELD_DIVIDER
+ "' + doc['descriptiveMetadata.dc:title'].value"); + "' + doc['descriptiveMetadata.dc:title'].value");
// Do filter all collections (via descriptiveMetadata.dc:format) AND get out all the child // Do filter all collections (via administrativeMetadata.dcterms:format) AND get out all the
// objects and collections (NO descriptiveMetadata.dc:relation), so we get exactly one set per // child, objects and collections (NO administrativeMetadata.dc:relation), so we get exactly
// root collection only! // one set per root collection only!
AggregationBuilder collectionFilter = AggregationBuilders.filter(DH_COLLECTION_FILTER_NAME, AggregationBuilder collectionFilter = AggregationBuilders.filter(DH_COLLECTION_FILTER_NAME,
QueryBuilders.boolQuery() QueryBuilders.boolQuery()
.mustNot(QueryBuilders.existsQuery("descriptiveMetadata.dc:relation")) .mustNot(QueryBuilders.existsQuery("administrativeMetadata.dcterms:relation"))
.must(QueryBuilders.matchPhraseQuery("descriptiveMetadata.dc:format", .must(QueryBuilders.matchPhraseQuery("administrativeMetadata.dcterms:format",
TextGridMimetypes.DARIAH_COLLECTION))); TextGridMimetypes.DARIAH_COLLECTION)));
AggregationBuilder collectionFilterTerm = AggregationBuilders AggregationBuilder collectionFilterTerm = AggregationBuilders
.terms(DH_COLLECTION_FILTER_TERM_NAME).script(mergeCollectionIDAndTitle).size(DH_SIZE); .terms(DH_COLLECTION_FILTER_TERM_NAME).script(mergeCollectionIDAndTitle).size(DH_SIZE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment