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 ebf1a5d171e9208fc7b79a6a3bfe0f254cac47fb..5fb0727999c88eb2b424615e75aba2c8870b7798 100644 (file)
--- 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 87626012052709afadf37f204abc5269912f6068..21a2df9db5349048187f7a7026124bed7f323d1d 100644 (file)
--- 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;
     }