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

fix: use more listsets getters and setters

Closes #63

See merge request dariah-de/dariah-de-oai-pmh-services!23

oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java

@@ -90,18 +90,16 @@ public class SetListDeliverer {
     // Assemble DH ES request.
     else if (this.dariah) {
 
-      Script mergeCollectionIDAndTitle = new Script(
-          "doc['administrativeMetadata.dcterms:identifier'].value + '" + DH_FIELD_DIVIDER
-              + "' + doc['descriptiveMetadata.dc:title'].value");
+      Script mergeCollectionIDAndTitle = new Script("doc['" + this.identifierField + "'].value + '"
+          + DH_FIELD_DIVIDER + "' + doc['descriptiveMetadata.dc:title'].value");
 
-      // Do filter all collections (via administrativeMetadata.dcterms:format) AND get out all the
-      // child, objects and collections (NO administrativeMetadata.dc:relation), so we get exactly
-      // one set per root collection only!
+      // Do filter all collections (via formatToFilter) AND get out all the child objects and
+      // collections (NO administrativeMetadata.dcterms:relation), so we get exactly one set per
+      // root collection only!
       AggregationBuilder collectionFilter = AggregationBuilders.filter(DH_COLLECTION_FILTER_NAME,
           QueryBuilders.boolQuery()
               .mustNot(QueryBuilders.existsQuery("administrativeMetadata.dcterms:relation"))
-              .must(QueryBuilders.matchPhraseQuery("administrativeMetadata.dcterms:format",
-                  TextGridMimetypes.DARIAH_COLLECTION)));
+              .must(QueryBuilders.matchPhraseQuery(this.formatField, this.formatToFilter)));
       AggregationBuilder collectionFilterTerm = AggregationBuilders
           .terms(DH_COLLECTION_FILTER_TERM_NAME).script(mergeCollectionIDAndTitle).size(DH_SIZE);
 

oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties

@@ -88,16 +88,16 @@ subjectList = descriptiveMetadata.dc:subject
 titleList = descriptiveMetadata.dc:title
 typeList = descriptiveMetadata.dc:type
 
-#############################
-##  ListIdentifierSetting  ##
-#############################
+#####################################
+##  ListIdentifier/ListSetSetting  ##
+#####################################
 
 rangeField = administrativeMetadata.dcterms:modified
 identifierListFields = descriptiveMetadata.dc:identifier, descriptiveMetadata.dc:date, descriptiveMetadata.dc:format, administrativeMetadata.dcterms:identifier, administrativeMetadata.dcterms:modified
-formatField = descriptiveMetadata.dc:format
+formatField = administrativeMetadata.dcterms:format
 formatToFilter = text/vnd.dariah.dhrep.collection+turtle
 dateOfObjectCreation = administrativeMetadata.dcterms:created
-relationToFurtherMetadataObject = descriptiveMetadata.dc:relation
+relationToFurtherMetadataObject = administrativeMetadata.dcterms:relation
 repositoryObjectURIPrefix = hdl:
 identifierField = administrativeMetadata.dcterms:identifier
 modifiedField = administrativeMetadata.dcterms:modified