From: Andreas Müller <a.mueller@bgbm.org>
Date: Wed, 29 Sep 2021 13:37:39 +0000 (+0200)
Subject: ref #9795 evaluate includeLiterature
X-Git-Tag: 5.27.0^2~92^2~1
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/8a6770d63ffb8c8165acfa4ff5e5ca860b3cb88a

ref #9795 evaluate includeLiterature
---

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregation.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregation.java
index ebf1a5d171..5fb0727999 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregation.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregation.java
@@ -223,8 +223,10 @@ public class StructuredDescriptionAggregation
         StructuredDescriptionResultHolder descriptiveResultHolder = (StructuredDescriptionResultHolder)resultHolder;
         Set<SpecimenDescription> specimenDescriptions = getSpecimenDescriptions(taxon, dataSet);
         addDescriptionElement(descriptiveResultHolder, specimenDescriptions);
-        Set<TaxonDescription> literatureDescriptions = getLiteratureDescriptions(taxon, dataSet);
-        addDescriptionElement(descriptiveResultHolder, literatureDescriptions);
+        if (getConfig().isIncludeLiterature()){
+            Set<TaxonDescription> literatureDescriptions = getLiteratureDescriptions(taxon, dataSet);
+            addDescriptionElement(descriptiveResultHolder, literatureDescriptions);
+        }
         //TODO add defaultDescriptions
 
     }
diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregationTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregationTest.java
index 8762601205..21a2df9db5 100644
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregationTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregationTest.java
@@ -256,8 +256,7 @@ public class StructuredDescriptionAggregationTest extends CdmTransactionalIntegr
         testStatusOk(result);
         testAggregatedDescription();
 
-        dataSet = datasetService.find(dataSet.getId());
-        addLiterature(dataSet);
+        config.setIncludeLiterature(true);
         commitAndStartNewTransaction();
 
         result = engine.invoke(config, repository);
@@ -368,6 +367,7 @@ public class StructuredDescriptionAggregationTest extends CdmTransactionalIntegr
         config.setDatasetUuid(dataSet.getUuid());
         config.setAggregateToHigherRanks(true);
         config.setAggregationMode(AggregationMode.byWithinTaxonAndToParent());
+        config.setIncludeLiterature(false);
         return config;
     }
 
@@ -402,6 +402,8 @@ public class StructuredDescriptionAggregationTest extends CdmTransactionalIntegr
         @SuppressWarnings("unchecked")
         TermTree<Feature> descriptiveSystem = termTreeService.find(uuidFeatureTree);
         dataSet.setDescriptiveSystem(descriptiveSystem);
+
+        addLiterature(dataSet);
         return dataSet;
     }