restoring the property path paramenter to service method getOrderedDistributions

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
index 843db41cbc2ba1722c68926956bca19e75e791e8..5b1d4cf7706db0278b7ffce0ad740ae29096b35e 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
@@ -89,7 +89,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
                        "$",\r
                        "elements.$",\r
                        "elements.sources.citation.",\r
-//                     "elements.sources.citation.authorTeam.$",               \r
+                       "elements.sources.citation.authorTeam.$",               \r
 //                     "elements.sources.citation.authorTeam.titleCache",\r
 //                     "elements.sources.citation.authorTeam.nomenclaturalTitleCache",\r
                        "elements.sources.nameUsedInSource.titleCache",\r
@@ -177,7 +177,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
                        description = (TaxonDescription) service.load(descriptionUuid, TAXONDESCRIPTION_INIT_STRATEGY);\r
                        taxonDescriptions.add(description);\r
                }\r
-               DistributionTree distTree = service.getOrderedDistributionsB(taxonDescriptions, levels);\r
+               DistributionTree distTree = service.getOrderedDistributionsB(taxonDescriptions, levels, TAXONDESCRIPTION_INIT_STRATEGY);\r
                return distTree;\r
        }\r
        \r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
index 943f6820b077d14a548c860b508ae89b1ff5d58b..21df2e4e24e40459cf6fd77fdeca019d504f4c1a 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
@@ -518,7 +518,7 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
                        value = {"/portal/taxon/*/fromNameRelationships"},\r
                        method = RequestMethod.GET)\r
        public List<NameRelationship> doGetFromNameRelations(HttpServletRequest request, HttpServletResponse response)throws IOException {\r
-               logger.info("doGetNameRelations()" + request.getServletPath());\r
+               logger.info("doGetNameFromNameRelations()" + request.getServletPath());\r
                TaxonBase tb = getCdmBase(request, response, SIMPLE_TAXON_INIT_STRATEGY, Taxon.class);\r
                List<NameRelationship> list = nameService.listFromNameRelationships(tb.getName(), null, null, null, null, NAMERELATIONSHIP_INIT_STRATEGY);\r
                return list;\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
index e679e37938fe771db68478f7e881cf349894b6c4..7873786b9a32ee0cf9f1e895447f476ce4690626 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
@@ -217,13 +217,14 @@ public class DescriptionServiceImpl extends IdentifiableServiceBase<DescriptionB
        
        public DistributionTree getOrderedDistributionsB(
                        Set<TaxonDescription> taxonDescriptions,
-                       Set<NamedAreaLevel> omitLevels){
+                       Set<NamedAreaLevel> omitLevels,
+                       List<String> propertyPaths){
                
                DistributionTree tree = new DistributionTree();
                List<Distribution> distList = new ArrayList<Distribution>();
                
                for (TaxonDescription taxonDescription : taxonDescriptions) {
-                       taxonDescription = (TaxonDescription) dao.load(taxonDescription.getUuid());
+                       taxonDescription = (TaxonDescription) dao.load(taxonDescription.getUuid(), propertyPaths);
                        Set<DescriptionElementBase> elements = taxonDescription.getElements();
                        for (DescriptionElementBase element : elements) {
                                if(element.isInstanceOf(Distribution.class)){

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
index def5858f2dbb3c4ad1fef6e17ccbc21a3bbc236f..acd09de819a57c311cd34f823f1fc1daad6b95f5 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
@@ -242,7 +242,7 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
     
     public List<DescriptionElementBase> getDescriptionElementsForTaxon(Taxon taxon, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths);
 
-       public DistributionTree getOrderedDistributionsB(Set<TaxonDescription> taxonDescriptions, Set<NamedAreaLevel> levels);
+       public DistributionTree getOrderedDistributionsB(Set<TaxonDescription> taxonDescriptions, Set<NamedAreaLevel> levels, List<String> propertyPaths);
 
        /**
          * Generate a string representation of the structured <code>description</code> supplied in natural language